$ git diff --patch-with-stat --summary 71066a624e5948a0701a50985688074805c68dfb..940f140e330bb17642f7807f7cccbb134ab0ee6c
.abf.yml | 3 ++-
owncloudclient.rpmlintrc | 1 +
owncloudclient.spec | 47 +++++++++++++++++++++++++++++++----------------
3 files changed, 34 insertions(+), 17 deletions(-)
create mode 100644 owncloudclient.rpmlintrc
diff --git a/.abf.yml b/.abf.yml
index 642d63b..a0639f2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
sources:
- "owncloudclient-2.4.1.zip": 39cdf4ac77b621baa826970a46037c47f812d3fb
+ "owncloudclient-2.4.3.tar.xz": 7277706958ec3097eab0c272549b940a79d0cc1c
+ owncloudclient-2.5.0.10650.tar.xz: 9377c5537c94c000d5a85232ddd45b4050687cfe
diff --git a/owncloudclient.rpmlintrc b/owncloudclient.rpmlintrc
new file mode 100644
index 0000000..aa09e58
--- /dev/null
+++ b/owncloudclient.rpmlintrc
@@ -0,0 +1 @@
+addFilter("E: devel-file-in-non-devel-package")
diff --git a/owncloudclient.spec b/owncloudclient.spec
index 950a43b..32abeb1 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -1,16 +1,19 @@
%define major 0
%define libname %mklibname owncloudsync %{major}
-%define libocsync %mklibname ocsync %{major}
+%define libowncloud_csync %mklibname libowncloud_csync %{major}
%define devname %mklibname owncloudsync -d
Summary: The ownCloud Client
Name: owncloudclient
-Version: 2.4.1
+Version: 2.5.0
Release: 1
License: GPLv2+
Group: Archiving/Backup
Url: https://owncloud.org
-Source0: http://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
+Source0: http://download.owncloud.com/desktop/stable/%{name}-%{version}.10650.tar.xz
+#Source0: https://github.com/owncloud/client/archive/%{version}/%{name}-%{version}.zip
+#Source0: %{name}-%{version}.zip
+BuildRequires: stdc++-devel
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: iniparser-devel >= 3.1
@@ -52,7 +55,7 @@ BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(sqlite3) >= 3.8.0
BuildRequires: pkgconfig(zlib)
Requires: %{libname} = %{EVRD}
-%rename %{_lib}ocsync
+%rename %{_lib}owncloud_csync
%rename ocsync
%rename mirall
@@ -70,8 +73,11 @@ Server with your computer.
%{_datadir}/owncloud/
%{_datadir}/applications/owncloud.desktop
%{_datadir}/caja-python/extensions/syncstate-ownCloud.py
+#{_datadir}/caja-python/extensions/__pycache__/*
%{_datadir}/nemo-python/extensions/syncstate-ownCloud.py
+#{_datadir}/nemo-python/extensions/__pycache__/*
%{_datadir}/nautilus-python/extensions/syncstate-ownCloud.py
+#{_datadir}/nautilus-python/extensions/__pycache__/*
%{_datadir}/kservices5/ownclouddolphinactionplugin.desktop
#{_mandir}/man1/*
@@ -80,7 +86,7 @@ Server with your computer.
%package -n %{libname}
Summary: Shared library for ownCloud client
Group: System/Libraries
-Requires: %{libocsync} = %{EVRD}
+Requires: %{libowncloud_csync} = %{EVRD}
Conflicts: %{_lib}owncloudsync1 < %{EVRD}
%description -n %{libname}
@@ -95,19 +101,22 @@ Shared library for ownCloud client.
#----------------------------------------------------------------------------
-%package -n %{libocsync}
+%package -n %{libowncloud_csync}
Summary: Shared library for ownCloud client
Group: System/Libraries
Conflicts: %{_lib}owncloudsync1 < %{EVRD}
-%description -n %{libocsync}
+%description -n %{libowncloud_csync}
Shared library for ownCloud client.
-%files -n %{libocsync}
+%files -n %{libowncloud_csync}
%doc ChangeLog COPYING *.md
-%{_libdir}/libocsync.so.%{major}
-%{_libdir}/owncloud/libocsync.so.%{major}
-%{_libdir}/owncloud/libocsync.so.%{version}
+#{_libdir}/libocsync.so.%{major}
+#{_libdir}/libowncloud_csync.so
+%{_libdir}/libowncloud_csync.so.%{major}
+%{_libdir}/libowncloud_csync.so.%{version}
+#{_libdir}/owncloud/libocsync.so.%{major}
+#{_libdir}/owncloud/libocsync.so.%{version}
#----------------------------------------------------------------------------
@@ -123,13 +132,19 @@ This package contains development files for %{name}.
%files -n %{devname}
%doc ChangeLog COPYING *.md
%{_includedir}/owncloudsync
+%{_libdir}/libowncloud_csync.so
%{_libdir}/libowncloudsync.so
-%{_libdir}/owncloud/libocsync.so
+#{_libdir}/owncloud/libocsync.so
+
+%{_datadir}/mime/packages/owncloud.xml
+
+%exclude /usr/lib/debug/usr/lib64/libowncloud_csync.so.2.5.0*
+
#-----------------------------------------------------------------------------
%prep
-%setup -q
+%setup -qn %{name}-%{version}.10650
%build
@@ -149,9 +164,9 @@ chmod +x %{buildroot}%{_datadir}/nemo-python/extensions/syncstate-ownCloud.py
chmod +x %{buildroot}%{_datadir}/nautilus-python/extensions/syncstate-ownCloud.py
# Dirty fix
-pushd %{buildroot}%{_libdir}
-cp owncloud/libocsync.so.%{major} libocsync.so.%{major}
-popd
+#pushd %{buildroot}%{_libdir}
+#cp owncloud/libocsync.so.%{major} libocsync.so.%{major}
+#popd