[mirall] Update to version 1.3.0

[Joseph Marrero]

commit 899ba334904352b931078357bb9ab326fab1fdb4
Author: jmarrero <jmarrero at fedoraproject.org>
Date:   Wed Jun 26 11:38:37 2013 -0400

    Update to version 1.3.0

 .gitignore  |    1 +
 mirall.spec |   46 +++++++++++++++-------------------------------
 sources     |    2 +-
 3 files changed, 17 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6770525..e05dd66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /mirall-1.2.3.tar.bz2
 /mirall-1.2.4.tar.bz2
 /mirall-1.2.5.tar.bz2
+/mirall-1.3.0.tar.bz2
diff --git a/mirall.spec b/mirall.spec
index 19e2a7a..9d05d79 100644
--- a/mirall.spec
+++ b/mirall.spec
@@ -1,18 +1,19 @@
 Name:           mirall
-Version:        1.2.5
+Version:        1.3.0
 Release:        1%{?dist}
 License:        GPLv2+
 Summary:        The ownCloud Client
 Url:            http://www.gitorious.org/owncloud/mirall/
 Source0:        http://download.owncloud.com/download/mirall-%{version}.tar.bz2
-Source1:        mirall.desktop
 
 BuildRequires:  cmake
-BuildRequires:  owncloud-csync-devel >= 0.70.7
+BuildRequires:  owncloud-csync-devel >= 0.80.0
 BuildRequires:  iniparser-devel
 BuildRequires:  qt4-devel 
 BuildRequires:  desktop-file-utils
 Requires:       %{name}-common%{?_isa} = %{version}-%{release}
+Provides:       owncloud-client = %{version}-%{release}
+Obsoletes:      owncloud-client < 1.3.0
 
 %description
 Mirall owncloud-client enables you to connect to your private
@@ -23,7 +24,7 @@ ownCloud Client does the rest.
 
 %package common
 Summary: common files for mirall and owncloud-client
-Requires: owncloud-csync-plugin-owncloud >= 0.70.7
+Requires: owncloud-csync-plugin-owncloud >= 0.80.0
 
 %description common
 provides common files for mirall and owncloud-client
@@ -43,7 +44,7 @@ The ownCloud desktop client, lets you sync directly to your ownCloud server.
 %build
 mkdir build
 pushd build
-%cmake .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" -DCSYNC_LIBRARY:PATH=%{_libdir}/libocsync.so -DCSYNC_INCLUDE_PATH:PATH=%{_includedir}/ocsync -DPLASMACLIENT=ON
+%cmake .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" -DCSYNC_LIBRARY:PATH=%{_libdir}/libocsync.so -DCSYNC_INCLUDE_PATH:PATH=%{_includedir}/ocsync
 make %{?_smp_mflags}
 popd
 
@@ -52,9 +53,6 @@ pushd build
 make install DESTDIR=%{buildroot}
 popd
 
-desktop-file-install                                    \
---dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
-%{SOURCE1}
 
 %post 
 /sbin/ldconfig 
@@ -70,25 +68,11 @@ if [ $1 -eq 0 ] ; then
     gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%post -n owncloud-client
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-
-%posttrans -n owncloud-client
-gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun -n owncloud-client
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-    gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || :
-fi
-
 
 %files
-%{_bindir}/mirall
-%{_datadir}/applications/mirall.desktop
-%{_datadir}/icons/hicolor/48x48/apps/mirall.png
+%{_bindir}/owncloud
+%{_datadir}/applications/owncloud.desktop
+%{_datadir}/icons/hicolor/48x48/apps/owncloud.png
 
 %files common
 %{_libdir}/libowncloudsync.so  
@@ -98,17 +82,17 @@ fi
 %doc README.md COPYING
 %config  %{_prefix}%{_sysconfdir}/sync-exclude.lst
 
-%files -n owncloud-client
-%{_bindir}/owncloud
-%{_datadir}/applications/owncloud.desktop
-%{_datadir}/icons/hicolor/48x48/apps/owncloud.png
 
 %changelog
+* Wed Jun 26 2013 <jmarrero at fedoraproject.org> 1.3.0-1
+- Update to version 1.3.0
+* Thu May 23 2013 <jmarrero at fedoraproject.org> 1.3.0beta1-1
+- Update to testing version 1.3.0beta1
 * Tue Apr 23 2013 <jmarrero at fedoraproject.org> 1.2.5-1
 - Update to upstream version 1.2.5
 * Thu Apr 11 2013 <jmarrero at fedoraproject.org> 1.2.4-1
 - Update to uptream version 1.2.4
-* Tue Apr 03 2013 <jmarrero at fedoraproject.org> 1.2.3-1
+* Wed 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
@@ -142,7 +126,7 @@ fi
 * Fri Aug 17 2012 <jmarrero at fedoraproject.org> 1.0.5-3
 - added icon scriplets for owncloud-client icons
 - moved %%doc to mirall-common
-- Added cmake  dcSYNC_INCLUDE_PATH:PATH=%{_includedir}/occsync and dc SYNC_LIBRARY:PATH=%{_libdir}/liboccsync.so to have mirall look for occsync instead of csync
+- Added cmake  dcSYNC_INCLUDE_PATH:PATH=_includedir}/occsync and dc SYNC_LIBRARY:PATH=_libdir}/liboccsync.so to have mirall look for occsync instead of csync
 - Removed uneeded dep
 - Changelog corrections and clean up
 * Thu Aug 16 2012 <jmarrero at fedoraproject.org> 1.0.5-2
diff --git a/sources b/sources
index fa783b9..f8e8e1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2279761b409238f5c92507ba8062be4a  mirall-1.2.5.tar.bz2
+ee2e7bafc714399f2027fefed853f968  mirall-1.3.0.tar.bz2