[mirall] Remove plasma client because has not been marged uptream and update to latest uptream client.
Joseph Marrero
jmarrero at fedoraproject.org
Wed Apr 3 16:28:53 UTC 2013
commit 967f89d853c7571d503d293295bd94d0ed8f2679
Author: joseph <joseph at localhost.localdomain>
Date: Wed Apr 3 12:28:01 2013 -0400
Remove plasma client because has not been marged uptream and update to latest uptream client.
.gitignore | 1 +
mirall.spec | 43 ++++++++-----------------------------------
sources | 2 +-
3 files changed, 10 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7944e9e..5532bdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/mirall-1.2.0.tar.bz2
/mirall-1.2.1.tar.bz2
/mirall-1.2.2.tar.bz2
+/mirall-1.2.3.tar.bz2
diff --git a/mirall.spec b/mirall.spec
index 8b5c680..f63e46c 100644
--- a/mirall.spec
+++ b/mirall.spec
@@ -1,6 +1,6 @@
Name: mirall
-Version: 1.2.2
-Release: 2%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
License: GPLv2+
Summary: The ownCloud Client
Url: http://www.gitorious.org/owncloud/mirall/
@@ -8,11 +8,10 @@ Source0: http://download.owncloud.com/download/mirall-%{version}.tar.bz2
Source1: mirall.desktop
BuildRequires: cmake
-BuildRequires: owncloud-csync-devel >= 0.70.4
+BuildRequires: owncloud-csync-devel >= 0.70.5
BuildRequires: iniparser-devel
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description
@@ -38,15 +37,6 @@ Requires: %{name}-common%{?_isa} = %{version}-%{release}
%description -n owncloud-client
The ownCloud desktop client, lets you sync directly to your ownCloud server.
-%package -n owncloud-plasma-client
-Summary: common files for mirall and owncloud-client
-Requires: %{name}-common%{?_isa} = %{version}-%{release}
-Requires: kdelibs4
-
-%description -n owncloud-plasma-client
-The owncloud plasma client, plasma interface for the owncloud-client.
-
-
%prep
%setup -q %{name}-%{version}
@@ -101,14 +91,9 @@ fi
%{_datadir}/icons/hicolor/48x48/apps/mirall.png
%files common
-#remove libmirallsync on official merge
-%{_libdir}/libmirallsync.so
%{_libdir}/libowncloudsync.so
-##for some reason this is unlinked in this mirall pull, in the uptream version is working
-/usr/lib/libowncloudsync.so
-# re activate when officially merged#%{_libdir}/libowncloudsync.so.0
-#%{_libdir}/libowncloudsync.so.%{version}
-
+%{_libdir}/libowncloudsync.so.0
+%{_libdir}/libowncloudsync.so.%{version}
%{_datadir}/mirall
%doc README.md COPYING
%config %{_prefix}%{_sysconfdir}/sync-exclude.lst
@@ -118,22 +103,10 @@ fi
%{_datadir}/applications/owncloud.desktop
%{_datadir}/icons/hicolor/48x48/apps/owncloud.png
-%files -n owncloud-plasma-client
-%{_kde4_datadir}/kde4/apps/plasma/packages/org.kde.active.settings.owncloud/*
-%{_kde4_datadir}/kde4/services/plasma-package-org.kde.active.settings.owncloud.desktop
-%{_kde4_datadir}/autostart/owncloudsyncd.desktop
-%{_kde4_libdir}/kde4/plasma_applet_owncloud.so
-%{_kde4_datadir}/kde4/services/plasma-applet-owncloud.desktop
-%{_kde4_datadir}/autostart/owncloudsync.desktop
-%{_kde4_libdir}/libkdeinit4_owncloudsyncd.so
-%{_kde4_bindir}/owncloudsyncd
-%{_kde4_libdir}/kde4/active_settings_owncloud.so
-%{_kde4_libdir}/kde4/kcm_owncloud.so
-%{_kde4_datadir}/kde4/services/owncloudconfig.desktop
-%{_kde4_datadir}/kde4/services/settings-synchronization.desktop
-
-
%changelog
+* Tue Apr 03 2013 <jmarrero at fedoraproject.org> 1.2.3-1
+- remove plasma client files as is not officially merged uptream
+- Update to 1.2.3 uptream version
* Tue Mar 05 2013 <jmarrero at fedoraproject.org> 1.2.2-2
- plasma client files fix
* Tue Mar 05 2013 <jmarrero at fedoraproject.org> 1.2.2-1
diff --git a/sources b/sources
index 96bbb33..b433cef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87377e6cbd9e6548094d9cb141fd96dd mirall-1.2.2.tar.bz2
+a3aa2cb1b9ccb13c7e8b0ef8a1b539df mirall-1.2.3.tar.bz2
More information about the scm-commits
mailing list