Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	owncloud-client.spec
@@ -15,6 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +Name: owncloud-client +Version: 1.5.4 +Release: 0 +License: GPL-2.0+ +Summary: The ownCloud Client - Private file sync and share client based on Mirall +Url: https://github.com/owncloud/mirall +Group: Productivity/Networking/Other +Source0: mirall-%{version}.tar.bz2 +%if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?suse_version} == 1110 +Source1: owncloud.sh +Patch1: autostart_use_wrapper.diff +%endif +%if 0%{?suse_version} == 1110 +Patch2: sle_cmake.diff +%endif + %if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?suse_version} == 1110 %if 0%{?suse_version} == 1110 # SLES 11 calls make_install makeinstall @@ -23,60 +39,81 @@ # We need a more recent, prefixed Qt for SLE11 %define qtprefix opt- %define _prefix /opt/qt-4.8 -%define cmake_args -DCMAKE_INCLUDE_PATH=%{_prefix}/include -DCMAKE_LIBRARY_PATH=%{_prefix}/lib64 +%define cmake_args -DCMAKE_INCLUDE_PATH=%{_prefix}/include -DCMAKE_LIBRARY_PATH=%{_prefix}/%{_lib} -DNEON_INCLUDE_DIRS=/opt/neon-0.30.0/include/ -DNEON_LIBRARIES=/opt/neon-0.30.0/%{_lib}/libneon.so.27 %else -%define qtprefix %{nil} -%define cmake_args%{nil} +%define qtprefix %{nil} +%define cmake_args %{nil} %endif -Name: owncloud-client -Version: 1.5.4 -Release: 1.1 -License: GPL-2.0+ -Summary: The ownCloud Client - Private file sync and share client based on Mirall -Url: https://www.github.com/owncloud/mirall/ -Group: Productivity/Networking/Other -Source0: mirall-%{version}.tar.bz2 -%if 0%{?suse_version} == 1110 -Patch0: cmake.diff -%endif -%if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?suse_version} == 1110 -Source1: owncloud.sh -Patch1: autostart_use_wrapper.diff -%endif +# default to have no docs. Cannot be built with old distros. +%define have_doc 0 -BuildRequires: cmake -BuildRequires: libocsync-devel -BuildRequires: oxygen-icon-theme -BuildRequires: gcc gcc-c++ -BuildRequires: %{qtprefix}libqtkeychain-devel +BuildRequires: cmake gcc gcc-c++ %{qtprefix}libqtkeychain-devel %if 0%{?fedora_version} -BuildRequires: iniparser BuildRequires: qt4 qt4-devel >= 4.7 BuildRequires: inetd desktop-file-utils BuildRequires: qtwebkit >= 2.2 BuildRequires: qtwebkit-devel >= 2.2 %endif + %if 0%{?suse_version} +BuildRequires: libneon-devel BuildRequires: update-desktop-files %endif + +%if 0%{?fedora_version} +BuildRequires: python-sphinx +%endif + +%if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?suse_version} == 1110 +BuildRequires: oc-neon-devel +%else +BuildRequires: neon-devel +%define have_doc 1 +%endif + +%if 0%{?fedora_version} \|\| 0%{?rhel_version} \|\| 0%{?centos_version} +BuildRequires: sqlite-devel +BuildRequires: inetd desktop-file-utils +%else +BuildRequires: python-Sphinx +BuildRequires: sqlite3-devel +BuildRequires: libneon-devel +BuildRequires: update-desktop-files +%endif + %if 0%{?suse_version} \|\| 0%{?rhel_version} \|\| 0%{?centos_version} BuildRequires: %{qtprefix}libqt4-devel >= 4.7 BuildRequires: %{qtprefix}libQtWebKit-devel BuildRequires: %{qtprefix}libQtWebKit4 +%else +BuildRequires: libqt4-devel >= 4.7 %endif %if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?suse_version} == 1110 Requires: %{qtprefix}libqt4-x11 Requires: %{qtprefix}libQtWebKit4 +Requires: %{qtprefix}libqt4-sql +Requires: %{qtprefix}libqt4-sql-sqlite +Requires: oc-neon +%else +%if 0%{?fedora_version} +Requires: qt4-sqlite +%else +Requires: libqt4-sql-sqlite %endif -Requires: libocsync-plugin-owncloud >= 0.90.4 -%if 0%{?fedora_version} \|\| 0%{?rhel_version} \|\| 0%{?centos_version} -# Extra invitation to the party -Requires: libocsync0 >= 0.90.4 %endif -Requires: net-tools + +Requires: %{name}-l10n +Requires: libowncloudsync0 = %{version} + +Obsoletes: libocsync0 +Obsoletes: libocsync-devel +Obsoletes: libocsync-plugin-owncloud +Obsoletes: libocsync-devel-doc +Obsoletes: libocsync-doc + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -104,39 +141,102 @@ Duncan Mac-Vicar P. <duncan@kde.org> Klaas Freitag <freitag@owncloud.com> Daniel Molkentin <danimo@owncloud.com> + +%package -n %{name}-doc +Summary: Documentation for ownCloud Client +Group: Development/Libraries/C and C++ +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n %{name}-doc +Documentation about the ownCloud Client desktop application. + +%package -n %{name}-l10n +Summary: Localisation for ownCloud Client +Group: Development/Libraries/C and C++ +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n %{name}-l10n +Localisation files for the ownCloud Client desktop application. + +%package -n libowncloudsync0 +Requires: %{qtprefix}libqtkeychain0 >= 0.3 +Summary: ownClouds sync library +Group: Development/Libraries/C and C++ + +%description -n libowncloudsync0 +The ownCloud client sync library. + +%package -n libowncloudsync-devel +Summary: Development files for ownClouds sync library +Group: Development/Libraries/C and C++ +Requires: libowncloudsync0 = %{version} + +%description -n libowncloudsync-devel +Development files for the ownCloud client sync library. %prep %setup -q -n mirall-%{version} - -%if 0%{?suse_version} == 1110 -%patch0 -p1 -%endif %if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?suse_version} == 1110 %patch1 -p1 %endif +%if 0%{?suse_version} == 1110 +%patch2 -p1 +%endif %build export LD_LIBRARY_PATH=%{_prefix}/lib64 export PATH=%{_prefix}/bin:$PATH + mkdir build pushd build -export CSYNC_DIR=/usr/include/ocsync -cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix:/usr} -DSYSCONF_INSTALL_DIR=/etc %{cmake_args} -make %{?_smp_mflags} owncloud +cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix:/usr} -DCMAKE_INSTALL_SYSCONFDIR=/etc/ownCloud -DWITH_DOC=TRUE \ + -DCMAKE_C_FLAGS:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_DOC_INSTALL_PATH=%{_docdir}/ocsync \
[-] [+]	Deleted	cmake.diff ^
@@ -1,37 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4d53962..b8a0c0b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,20 +56,20 @@ set(DATADIR ${DATA_INSTALL_DIR}) - ##### - ## handle BUILD_OWNCLOUD_OSX_BUNDLE - # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX --if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE)) -- set(BUILD_OWNCLOUD_OSX_BUNDLE ON) -- set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app") -- set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") -- set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") -- --# BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX --elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE) -- message(FATAL_ERROR "Building in non-bundle mode on OSX is currently not supported. Comment this error out if you want to work on/test it.") -+#if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE)) -+# set(BUILD_OWNCLOUD_OSX_BUNDLE ON) -+# set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app") -+# set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") -+# set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") -+# -+## BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX -+#elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE) -+# message(FATAL_ERROR "Building in non-bundle mode on OSX is currently not supported. Comment this error out if you want to work on/test it.") - - # any other platform --else() -+#else() - set(BUILD_OWNCLOUD_OSX_BUNDLE OFF) --endif() -+#endif() - ##### - - #### find libs -
[-] [+]	Added	sle_cmake.diff ^
@@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d53962..b8a0c0b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,20 +56,20 @@ set(DATADIR ${DATA_INSTALL_DIR}) + ##### + ## handle BUILD_OWNCLOUD_OSX_BUNDLE + # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX +-if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE)) +- set(BUILD_OWNCLOUD_OSX_BUNDLE ON) +- set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app") +- set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") +- set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") +- +-# BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX +-elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE) +- message(FATAL_ERROR "Building in non-bundle mode on OSX is currently not supported. Comment this error out if you want to work on/test it.") ++#if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE)) ++# set(BUILD_OWNCLOUD_OSX_BUNDLE ON) ++# set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app") ++# set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") ++# set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS") ++# ++## BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX ++#elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE) ++# message(FATAL_ERROR "Building in non-bundle mode on OSX is currently not supported. Comment this error out if you want to work on/test it.") + + # any other platform +-else() ++#else() + set(BUILD_OWNCLOUD_OSX_BUNDLE OFF) +-endif() ++#endif() + ##### + + #### find libs +