[packages/owncloudclient] - main build works
blues
blues at pld-linux.org
Tue Apr 12 12:23:26 CEST 2016
commit d5924c14b7c6e2b78900e98799a1d4e538a79677
Author: Paweł Gołaszewski <blues at pld-linux.org>
Date: Tue Apr 12 12:22:59 2016 +0200
- main build works
owncloudclient.spec | 112 ++++++++++------------------------------------------
1 file changed, 20 insertions(+), 92 deletions(-)
---
diff --git a/owncloudclient.spec b/owncloudclient.spec
index 8ea5957..665b49d 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -2,40 +2,23 @@
Summary: The ownCloud client
Name: owncloudclient
Version: 2.1.1
-Release: 0.1
+Release: 0.2
License: GPL-2.0+
Group: X11/Applications
URL: https://www.owncloud.com
Source0: https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
# Source0-md5: 63a971158201a8dffe96a02c54b86819
-Source1: owncloud.sh
-Source2: owncloudcmd.sh
+#Source1: owncloud.sh
+#Source2: owncloudcmd.sh
BuildRequires: cmake >= 2.8.11
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: qt4
-BuildRequires: qt4-devel >= 4.7
-BuildRequires: qtwebkit >= 2.2
-BuildRequires: qtwebkit-devel >= 2.2
-BuildRequires: inetd
+#BuildRequires: qt4-devel >= 4.7
+#BuildRequires: qtwebkit-devel >= 2.2
BuildRequires: desktop-file-utils
BuildRequires: openssl-devel
-BuildRequires: libQt5Concurrent-devel
-BuildRequires: libQt5Core-devel
-BuildRequires: libQt5DBus-devel
-BuildRequires: libQt5Gui-devel
-BuildRequires: libQt5Network-devel
-BuildRequires: libQt5PrintSupport-devel
-BuildRequires: libQt5WebKitWidgets-devel
-BuildRequires: libQt5Xml-devel
-BuildRequires: libqt5-linguist-devel
-BuildRequires: inetd
-BuildRequires: desktop-file-utils
-BuildRequires: sqlite-devel
-BuildRequires: sphinx-pdg
BuildRequires: python-Sphinx
-BuildRequires: sqlite3-devel
-BuildRequires: update-desktop-files
+BuildRequires: sphinx-pdg
+BuildRequires: texlive-latex-ams
+BuildRequires: QtKeychain-devel
Suggests: %{name}-nautilus
Suggests: %{name}-nemo
Requires: %{name}-l10n
@@ -118,45 +101,21 @@ This package provides overlay icons to visualize the sync state in the
nemo file manager.
%prep
-%setup -q -n owncloudclient-%{version}
-%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?suse_version} == 1110
+%setup -q
# autostart_use_wrapper.diff
-%patch1 -p1
-%endif
+#patch1 -p1
%build
-export LD_LIBRARY_PATH=%{optdir}/%{_lib}
-export PATH=%{optdir}/bin:$PATH
-
-mkdir build
-pushd build
-# http://www.cmake.org/Wiki/CMake_RPATH_handling#Default_RPATH_settings
-cmake .. -DWITH_DOC=TRUE \
-%if "%{prerelease}" != ""
- -DMIRALL_VERSION_SUFFIX="%{prerelease}" \
- -DMIRALL_VERSION_BUILD=0 \
-%endif
- -DCMAKE_C_FLAGS:STRING="%{optflags}" \
- -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if %{_lib} == lib64
- -DLIB_SUFFIX=64 \
-%endif
-%if ! %{is_owncloud_client}
- -DOEM_THEME_DIR=$PWD/../ownCloud/syncclient \
-%endif
-%if %{opt_hack}
-%if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600
- -DQTKEYCHAIN_INCLUDE_DIR=%{optdir}/include/qtkeychain \
- -DQTKEYCHAIN_LIBRARY=%{optdir}/%{_lib}/libqtkeychain.so \
-%else
- -DQTKEYCHAIN_INCLUDE_DIR=%{optdir}/include/qt5keychain \
- -DQTKEYCHAIN_LIBRARY=%{optdir}/%{_lib}/libqt5keychain.so \
-%endif
-%endif
- %cmake_args
+install -d build
+cd build
+%cmake \
+ -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
+ -DQTKEYCHAIN_INCLUDE_DIR=/usr/include/qtkeychain \
+ -DQTKEYCHAIN_LIBRARY=/usr/%{_lib}/libqtkeychain.so \
+ ../
+%{__make}
# documentation here?
if [ -e conf.py ];
@@ -165,60 +124,34 @@ then
mv conf.py doc/
fi
-env LD_RUN_PATH=%{_libdir}/owncloud:%{_libdir}/owncloud make %{?_smp_mflags} VERBOSE=1
-
%{__make} doc
-popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd build
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-if [ %{have_doc} != 0 ];
-then
install -d ${RPM_BUILD_ROOT}%{_docdir}/%{name}
mv ${RPM_BUILD_ROOT}%{_docdir}/client/* ${RPM_BUILD_ROOT}%{_docdir}/%{name}
rmdir ${RPM_BUILD_ROOT}%{_docdir}/client
rm ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/unthemed/.buildinfo
mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/unthemed/* ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/
rmdir ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/unthemed
-fi
-popd
-if [ -d ${RPM_BUILD_ROOT}%{_mandir}/man1 ]; then
-%if ! %{is_owncloud_client}
install -d ${RPM_BUILD_ROOT}%{_mandir}man1
mv ${RPM_BUILD_ROOT}%{_mandir}/man1/{owncloud.1,owncloud.1}
mv ${RPM_BUILD_ROOT}%{_mandir}/man1/{owncloudcmd.1,owncloudcmd.1}
-%endif
- gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/*.1
-fi
%define extdir ${RPM_BUILD_ROOT}%{_datadir}/nautilus-python/extensions
test -f %{extdir}/ownCloud.py && mv %{extdir}/ownCloud.py %{extdir}/owncloud.py || true
test -f %{extdir}/ownCloud.pyo && mv %{extdir}/ownCloud.pyo %{extdir}/owncloud.pyo || true
test -f %{extdir}/ownCloud.pyc && mv %{extdir}/ownCloud.pyc %{extdir}/owncloud.pyc || true
-%if %opt_hack
install -d ${RPM_BUILD_ROOT}/%{optdir}/bin
mv ${RPM_BUILD_ROOT}/%{_bindir}/owncloud* ${RPM_BUILD_ROOT}/%{optdir}/bin/
cp -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/owncloud
cp -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_bindir}/owncloudcmd
-%endif
-
-%if %{?suse_version:1}0
-%suse_update_desktop_file -n owncloud
-# workaround for https://github.com/owncloud/ownbrander/issues/322
-for desktop_icon_dir in $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/apps; do
- # copy shortname to executable name, if missing.
- if [ -f $desktop_icon_dir/owncloud.png -a ! -f $desktop_icon_dir/owncloud.png ]; then
- cp $desktop_icon_dir/owncloud.png $desktop_icon_dir/owncloud.png
- fi
-done
-%endif
%check
## use exit 0 instead of exit 1 to turn this into warnings:
@@ -230,7 +163,6 @@ if [ "%{name}" != "testpilotcloud-client" ]; then
fi
fi
-%if 0%{?fedora_version}
%post
/bin/%update_icon_cache_post hicolor &>/dev/null || :
@@ -242,7 +174,6 @@ fi
%posttrans
%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
%post -n libowncloudsync0
/sbin/ldconfig
@@ -271,9 +202,7 @@ fi
%files -n %{name}-doc
%defattr(644,root,root,755)
%doc README.md COPYING
-%if 0%{have_doc}
%doc %{_docdir}/%{name}
-%endif
%files -n %{name}-l10n
%defattr(644,root,root,755)
@@ -305,6 +234,5 @@ fi
%dir %{_datadir}/nemo-python
%dir %{_datadir}/nemo-python/extensions/
-
%clean
rm -rf $RPM_BUILD_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/owncloudclient.git/commitdiff/d5924c14b7c6e2b78900e98799a1d4e538a79677
More information about the pld-cvs-commit
mailing list