Hello community, here is the log from the commit of package nextcloud-client for openSUSE:Factory checked in at 2017-06-15 11:25:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nextcloud-client (Old) and /work/SRC/openSUSE:Factory/.nextcloud-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nextcloud-client" Thu Jun 15 11:25:32 2017 rev:6 rq:503717 version:2.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nextcloud-client/nextcloud-client.changes 2017-03-31 15:09:10.591022495 +0200 +++ /work/SRC/openSUSE:Factory/.nextcloud-client.new/nextcloud-client.changes 2017-06-15 11:26:00.969184067 +0200 @@ -1,0 +2,6 @@ +Wed Jun 14 15:12:48 UTC 2017 - [email protected] + +- Only enable documentation for openSUSE Leap 14.3 and newer + (boo#1044061). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nextcloud-client.spec ++++++ --- /var/tmp/diff_new_pack.lnSXRX/_old 2017-06-15 11:26:02.193011308 +0200 +++ /var/tmp/diff_new_pack.lnSXRX/_new 2017-06-15 11:26:02.197010743 +0200 @@ -57,12 +57,6 @@ BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Xml) -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) -BuildRequires: doxygen -BuildRequires: kio-devel -BuildRequires: python3-Sphinx -Suggests: %{name}-doc = %{version} -%endif %else BuildRequires: libqt4-linguist BuildRequires: qtkeychain-devel @@ -73,6 +67,14 @@ BuildRequires: pkgconfig(QtWebKit) BuildRequires: pkgconfig(QtXml) %endif +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +BuildRequires: kio-devel +%endif +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +BuildRequires: doxygen +BuildRequires: python3-Sphinx +Suggests: %{name}-doc = %{version} +%endif %description The Nextcloud Desktop Client is a tool to synchronise files from @@ -86,7 +88,7 @@ %lang_package -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %package doc Summary: Documentation for nextcloud-client Group: Documentation/HTML @@ -185,7 +187,7 @@ %cmake \ -DGIT_SHA1="GITDIR-NOTFOUND" \ -DCMAKE_SKIP_RPATH=OFF \ -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) -DWITH_DOC=ON \ %endif %if 0%{?suse_version} <= 1320 && !(0%{?sle_version} >= 120100 && 0%{?is_opensuse}) @@ -200,24 +202,16 @@ %cmake_install popd -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) -# Properly rename mans. -mv -f %{buildroot}%{_mandir}/man1/{owncloud,nextcloud}.1 -mv -f %{buildroot}%{_mandir}/man1/{owncloudcmd,nextcloudcmd}.1 - -mkdir -p %{buildroot}%{_docdir}/%{name}-doc/ -mv -f %{buildroot}%{_datadir}/doc/client/html/ \ - %{buildroot}%{_docdir}/%{name}-doc/html/ -%else -# There's no Nemo in openSUSE Leap 42.1 and older. -rm -rf %{buildroot}%{_datadir}/nemo-python/ -%endif - %if 0%{?suse_version} <= 1310 || (0%{?sle_version} && !0%{?is_opensuse}) # There's no Caja in SLE. rm -rf %{buildroot}%{_datadir}/caja-python/ %endif +%if 0%{?suse_version} <= 1320 && (0%{?sle_version} < 120200 && 0%{?is_opensuse}) +# There's no Nemo in openSUSE Leap 42.1 and older. +rm -rf %{buildroot}%{_datadir}/nemo-python/ +%endif + # Generate bytecode for extensions. for fm in caja nautilus nemo; do if [ -d %{buildroot}%{_datadir}/$fm-python/ ]; then @@ -225,6 +219,16 @@ fi done +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +# Properly rename mans. +mv -f %{buildroot}%{_mandir}/man1/{owncloud,nextcloud}.1 +mv -f %{buildroot}%{_mandir}/man1/{owncloudcmd,nextcloudcmd}.1 + +mkdir -p %{buildroot}%{_docdir}/%{name}-doc/ +mv -f %{buildroot}%{_datadir}/doc/client/html/ \ + %{buildroot}%{_docdir}/%{name}-doc/html/ +%endif + # A workaround for gh#owncloud/client#4107 install -Dpm 0644 sysctl-sync-inotify.conf \ %{buildroot}%{_sysconfdir}/sysctl.d/100-%{name}-sync-inotify.conf @@ -257,7 +261,7 @@ %dir %{_datadir}/icons/hicolor/512x512/apps/ %endif %{_datadir}/icons/hicolor/*/apps/Nextcloud*.* -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %{_mandir}/man1/nextcloud*.1%{?ext_man} %endif @@ -265,7 +269,7 @@ %defattr(-,root,root) %{_datadir}/nextcloud/i18n/ -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %files doc %defattr(-,root,root) %doc %{_docdir}/%{name}-doc/
