comzeradd pushed to mirall (f20). "Updated to 1.7.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 6 16:58:45 UTC 2015
>From aad4c496ee51f3005d0e159c101898c3d4089946 Mon Sep 17 00:00:00 2001
From: Nikos Roussos <nikos at roussos.cc>
Date: Mon, 10 Nov 2014 13:17:49 +0200
Subject: Updated to 1.7.0
diff --git a/.gitignore b/.gitignore
index de33052..5ffdea3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/mirall-1.5.0.tar.bz2
/mirall-1.5.3.tar.bz2
/mirall-1.5.4.tar.bz2
+/mirall-1.7.0.tar.bz2
diff --git a/mirall-1.7.0-rpath.patch b/mirall-1.7.0-rpath.patch
new file mode 100644
index 0000000..f2714c5
--- /dev/null
+++ b/mirall-1.7.0-rpath.patch
@@ -0,0 +1,30 @@
+diff -ur mirall-1.7.0.orig/src/CMakeLists.txt mirall-1.7.0/src/CMakeLists.txt
+--- mirall-1.7.0.orig/src/CMakeLists.txt 2014-11-10 12:30:57.350939810 +0200
++++ mirall-1.7.0/src/CMakeLists.txt 2014-11-10 12:32:47.912158611 +0200
+@@ -184,7 +184,7 @@
+ SOVERSION ${MIRALL_SOVERSION}
+ )
+ set_target_properties( ${synclib_NAME} PROPERTIES
+- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+
+ target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
+
+@@ -391,7 +391,7 @@
+ )
+ # Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
+ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+
+
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
+@@ -426,7 +426,7 @@
+ set_target_properties(${owncloudcmd_NAME} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
+ set_target_properties(${owncloudcmd_NAME} PROPERTIES
+- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+
+ target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME})
+ endif()
diff --git a/mirall-1.7.0-syslibs.patch b/mirall-1.7.0-syslibs.patch
new file mode 100644
index 0000000..9078e5b
--- /dev/null
+++ b/mirall-1.7.0-syslibs.patch
@@ -0,0 +1,93 @@
+diff -ur mirall-1.7.0.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h mirall-1.7.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h
+--- mirall-1.7.0.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2014-11-10 12:30:57.357939824 +0200
++++ mirall-1.7.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2014-11-10 12:34:16.898334714 +0200
+@@ -27,7 +27,7 @@
+ **
+ ****************************************************************************/
+
+-#include <qtlockedfile.h>
++#include <QtSolutions/qtlockedfile.h>
+
+ #include <QLocalServer>
+ #include <QLocalSocket>
+diff -ur mirall-1.7.0.orig/src/CMakeLists.txt mirall-1.7.0/src/CMakeLists.txt
+--- mirall-1.7.0.orig/src/CMakeLists.txt 2014-11-10 12:30:57.350939810 +0200
++++ mirall-1.7.0/src/CMakeLists.txt 2014-11-10 12:38:53.026881173 +0200
+@@ -33,10 +33,6 @@
+ endif()
+
+ set(3rdparty_SRC
+-3rdparty/qtsingleapplication/qtsingleapplication.cpp
+-3rdparty/qtsingleapplication/qtlocalpeer.cpp
+-3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
+-3rdparty/qtlockedfile/qtlockedfile.cpp
+ 3rdparty/fancylineedit/fancylineedit.cpp
+ 3rdparty/QProgressIndicator/QProgressIndicator.cpp
+ )
+@@ -49,15 +45,7 @@
+ )
+ endif()
+
+-if(NOT WIN32)
+- list(APPEND 3rdparty_SRC 3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
+-else()
+- list(APPEND 3rdparty_SRC 3rdparty/qtlockedfile/qtlockedfile_win.cpp )
+-endif()
+-
+ set(3rdparty_INC
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtlockedfile
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication
+ ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QProgressIndicator
+ ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/fancylineedit
+ ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson
+@@ -397,6 +385,8 @@
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+ target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
++ target_link_libraries( ${APPLICATION_EXECUTABLE} QtSolutions_LockedFile-2.4 )
++ target_link_libraries( ${APPLICATION_EXECUTABLE} QtSolutions_SingleApplication-2.6 )
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
+
+ install(TARGETS ${APPLICATION_EXECUTABLE}
+diff -ur mirall-1.7.0.orig/src/mirall/application.cpp mirall-1.7.0/src/mirall/application.cpp
+--- mirall-1.7.0.orig/src/mirall/application.cpp 2014-11-10 12:30:57.348939806 +0200
++++ mirall-1.7.0/src/mirall/application.cpp 2014-11-10 12:39:43.851981756 +0200
+@@ -79,7 +79,7 @@
+ // ----------------------------------------------------------------------------------
+
+ Application::Application(int &argc, char **argv) :
+- SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
++ QtSingleApplication(Theme::instance()->appName() ,argc, argv),
+ _gui(0),
+ _theme(Theme::instance()),
+ _helpOnly(false),
+@@ -484,7 +484,7 @@
+ return true;
+ }
+
+- return SharedTools::QtSingleApplication::winEventFilter(pMsg, result);
++ return QtSingleApplication::winEventFilter(pMsg, result);
+ }
+ #endif
+
+diff -ur mirall-1.7.0.orig/src/mirall/application.h mirall-1.7.0/src/mirall/application.h
+--- mirall-1.7.0.orig/src/mirall/application.h 2014-11-10 12:30:57.348939806 +0200
++++ mirall-1.7.0/src/mirall/application.h 2014-11-10 12:40:21.490059648 +0200
+@@ -20,7 +20,7 @@
+ #include <QQueue>
+ #include <QTimer>
+
+-#include "qtsingleapplication.h"
++#include "QtSolutions/QtSingleApplication"
+
+ #include "mirall/syncresult.h"
+ #include "mirall/logbrowser.h"
+@@ -39,7 +39,7 @@
+ class Folder;
+ class SslErrorDialog;
+
+-class Application : public SharedTools::QtSingleApplication
++class Application : public QtSingleApplication
+ {
+ Q_OBJECT
+ public:
diff --git a/mirall.spec b/mirall.spec
index fbf3b08..f347cd9 100644
--- a/mirall.spec
+++ b/mirall.spec
@@ -1,11 +1,14 @@
Name: mirall
-Version: 1.5.4
-Release: 4%{?dist}
-License: GPLv2+
+Version: 1.7.0
+Release: 1%{?dist}
Summary: The ownCloud Client
+
+License: GPLv2+
Url: http://owncloud.org/sync-clients/
Source0: http://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.bz2
-Patch0: %{name}-1.5.3-syslibs.patch
+Patch0: %{name}-1.7.0-syslibs.patch
+# Port of https://github.com/owncloud/mirall/pull/2104
+Patch1: %{name}-1.7.0-rpath.patch
BuildRequires: cmake
BuildRequires: qt4-devel
@@ -19,8 +22,8 @@ BuildRequires: sqlite-devel
BuildRequires: python-sphinx
BuildRequires: qtlockedfile-devel
BuildRequires: qtsingleapplication-devel
-
Requires: %{name}-common%{?_isa} = %{version}-%{release}
+
Provides: owncloud-client = %{version}-%{release}
Obsoletes: mirall < 1.5.2
@@ -30,21 +33,20 @@ Obsoletes: owncloud-csync-plugin-smb < 0.70
Obsoletes: owncloud-csync-plugin-sftp < 0.91
Obsoletes: owncloud-csync-plugin-owncloud < 0.91
+
%description
-Mirall owncloud-client enables you to connect to your private
-ownCloud Server. With it you can create folders in your home
-directory, and keep the contents of those folders synced with your
-ownCloud server. Simply copy a file into the directory and the
-ownCloud Client does the rest.
+Mirall owncloud-client enables you to connect to your private ownCloud Server.
+With it you can create folders in your home directory, and keep the contents
+of those folders synced with your ownCloud server. Simply copy a file into
+the directory and the ownCloud Client does the rest.
%package common
Summary: common files for mirall and owncloud-client
Obsoletes: owncloud-csync-libs < 1.5.2
%description common
-provides common files for mirall and owncloud-client
-such as the configurationfile that determines the excluded files
-in a sync.
+provides common files for mirall and owncloud-client such as the configuration
+file that determines the excluded files in a sync.
%package devel
Summary: Development files for mirall
@@ -61,10 +63,20 @@ Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description -n owncloud-client
The ownCloud desktop client, lets you sync directly to your ownCloud server.
+%package nautilus
+Summary: owncloud client nautilus extension
+Requires: nautilus
+
+%description nautilus
+The owncloud desktop client nautilus extension.
+
+
%prep
-%setup -q %{name}-%{version}
+%setup -q
%patch0 -p1
-rm -r src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication
+%patch1 -p1
+rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication
+
%build
mkdir build
@@ -73,12 +85,14 @@ pushd build
make %{?_smp_mflags}
popd
+
%install
pushd build
make install DESTDIR=%{buildroot}
popd
%find_lang %{name} --with-qt
+
%post
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -100,17 +114,19 @@ fi
%{_bindir}/owncloud
%{_bindir}/owncloudcmd
%{_datadir}/applications/owncloud.desktop
-%{_datadir}/icons/hicolor/48x48/apps/owncloud.png
-%{_datadir}/icons/hicolor/128x128/apps/owncloud.png
-%{_datadir}/icons/hicolor/22x22/apps/owncloud.png
-%{_datadir}/icons/hicolor/32x32/apps/owncloud.png
-%{_datadir}/icons/hicolor/64x64/apps/owncloud.png
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/128x128/apps/*
+%{_datadir}/icons/hicolor/256x256/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/72x72/apps/*
+%{_datadir}/icons/hicolor/64x64/apps/*
%files common
%{_libdir}/libowncloudsync.so.0
%{_libdir}/libowncloudsync.so.%{version}
-%{_libdir}/libocsync.so.*
-
+%{_libdir}/owncloud/libocsync.so.*
%doc README.md COPYING
%config %{_sysconfdir}/ownCloud/sync-exclude.lst
@@ -119,10 +135,26 @@ fi
%{_includedir}/owncloudsync/
%{_libdir}/libowncloudsync.so
%{_libdir}/libhttpbf.a
-%{_libdir}/libocsync.so
+%{_libdir}/owncloud/libocsync.so
%{_includedir}/httpbf.h
+%files nautilus
+%{_datadir}/nautilus-python/extensions/*
+
+
%changelog
+* Mon Nov 10 2014 Nikos Roussos <comzeradd at fedoraproject.org> - 1.7.0-1
+- Updated to 1.7.0
+
+* Sun Sep 14 2014 Dams <anvil[AT]livna.org> - 1.7.0-0.2.beta1
+- Updated tarball URL
+
+* Sun Sep 14 2014 Dams <anvil at livna.org> - 1.7.0-0.1.beta1
+- Updated to 1.7.0-beta1
+- Updated Patch0
+- Added Patch1 to fix rpath in binaries
+- Added nautilus subpackage
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 9884c01..eb97d8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe298c045c1a89b22105e7455694676 mirall-1.5.4.tar.bz2
+f662f4510ef26b5484f754304f8d9295 mirall-1.7.0.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mirall.git/commit/?h=f20&id=aad4c496ee51f3005d0e159c101898c3d4089946
More information about the scm-commits
mailing list