[owncloud-csync/f17: 3/3] Merge branch 'master' into f17

[Joseph Marrero]

commit 8f77fc798e312d64cd4c70f4fff967d0110c3992
Merge: 71274ef 67d02bc
Author: Joseph <joseph at localhost.localdomain>
Date:   Sun Oct 14 20:27:11 2012 +0000

    Merge branch 'master' into f17
    
    Conflicts:
    	owncloud-csync.spec

 .gitignore                        |    1 +
 clientCMakeLists_namechange.patch |   11 -----
 configCMakeLists_namechange.patch |    9 ----
 csync-0.50.8-COPYING_fix.patch    |   21 ---------
 docCMakeLists_namechange.patch    |   18 -------
 owncloud-csync.spec               |   90 +++++++++++++++++++++++-------------
 rootCMakeLists_namechange.patch   |    8 ---
 sources                           |    2 +-
 srcCMakeLists_namechange.patch    |   17 -------
 9 files changed, 59 insertions(+), 118 deletions(-)
---
diff --cc owncloud-csync.spec
index 7c36c3c,bdd5047..2aa0477
--- a/owncloud-csync.spec
+++ b/owncloud-csync.spec
@@@ -1,20 -1,10 +1,29 @@@
  Name:           owncloud-csync
++<<<<<<< HEAD
 +Version:        0.50.8
 +Release:        9%{?dist}
 +Summary:        A user level bidirectional client only file synchronizer
 +License:        GPLv2+
 +Url:            http://owncloud.org/sync-clients/
 +Source0:        http://download.owncloud.com/download/csync-%{version}.tar.bz2
 +
 +## uptramable patches
 +#fix fsf address in COPYING file
 +Patch01: csync-0.50.8-COPYING_fix.patch
 +Patch02: rootCMakeLists_namechange.patch
 +Patch03: clientCMakeLists_namechange.patch
 +Patch04: configCMakeLists_namechange.patch
 +Patch05: docCMakeLists_namechange.patch
 +Patch06: srcCMakeLists_namechange.patch
 +
++=======
+ Version:        0.60.0
+ Release:        1%{?dist}
+ Summary:        A user level bidirectional client only file synchronizer
+ License:        GPLv2+
+ Url:            http://owncloud.org/sync-clients/
+ Source0:        http://download.owncloud.com/download/ocsync-%{version}.tar.bz2
++>>>>>>> master
  
  BuildRequires:  check
  BuildRequires:  cmake
@@@ -84,23 -66,13 +85,27 @@@ development
  
  %package doc
  BuildArch: noarch
- Summary:        User documentation for csync
+ Summary:        User documentation for ocsync
  
  %description doc
- The csync-doc package provides user documentation for csync.
+ The ocsync-doc package provides user documentation for ocsync.
  
  %prep
++<<<<<<< HEAD
 +%setup -q -n csync-%{version}
 +
 +%patch01 -p1 -b .COPYING_fix
 +%patch02 -p1 -b .root_namechange
 +%patch03 -p1 -b .client_namechange
 +%patch04 -p1 -b .config_namechange
 +%patch05 -p1 -b .doc_namechange
 +%patch06 -p1 -b .src_namechange
 +
 +mv %{_builddir}/csync-%{version}/doc/csync.1 %{_builddir}/csync-%{version}/doc/occsync.1 
 +mv %{_builddir}/csync-%{version}/doc/csync.1.txt %{_builddir}/csync-%{version}/doc/occsync.1.txt
++=======
+ %setup -q -n ocsync-%{version}
++>>>>>>> master
  
  %build
  if test ! -e "build"; then
@@@ -132,30 -104,27 +137,42 @@@ popd buil
  %postun libs -p /sbin/ldconfig
  
  %files
- %{_bindir}/occsync
- %{_mandir}/man?/occsync.*
+ %{_bindir}/ocsync
+ %{_mandir}/man?/ocsync.*
  
  %files libs
- %config(noreplace) %{_sysconfdir}/occsync/csync.conf
- %config(noreplace) %{_sysconfdir}/occsync/csync_exclude.conf
- %config(noreplace) %{_sysconfdir}/occsync/csync_log.conf
+ %config(noreplace) %{_sysconfdir}/ocsync/ocsync.conf
+ %config(noreplace) %{_sysconfdir}/ocsync/ocsync_exclude.conf
+ %config(noreplace) %{_sysconfdir}/ocsync/ocsync_log.conf
  %doc AUTHORS COPYING README ChangeLog
++<<<<<<< HEAD
 +%dir %{_sysconfdir}/occsync
 +%{_libdir}/liboccsync.so.*
 +%dir %{_libdir}/occsync-0
 +
 +%files plugin-smb
 +%{_libdir}/occsync-0/csync_smb.so
 +
 +%files plugin-sftp
 +%{_libdir}/occsync-0/csync_sftp.so
 +
 +%files plugin-owncloud
 +%{_libdir}/occsync-0/csync_owncloud.so
++=======
+ %dir %{_sysconfdir}/ocsync
+ %{_libdir}/libocsync.so.*
+ %dir %{_libdir}/ocsync-0
+ 
+ %files plugin-sftp
+ %{_libdir}/ocsync-0/ocsync_sftp.so
+ 
+ %files plugin-owncloud
+ %{_libdir}/ocsync-0/ocsync_owncloud.so
++>>>>>>> master
  
  %files devel
- %{_includedir}/occsync
- %{_libdir}/liboccsync.so
+ %{_includedir}/ocsync
+ %{_libdir}/libocsync.so
  
  %files devel-doc
  %{_docdir}/%{name}-devel-%{version}/html
@@@ -164,6 -133,10 +181,13 @@@
  %{_docdir}/%{name}-%{version}
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Sun Oct 14 2012 <jmarrero at fedoraproject.org> 0.60.0-1
+ - Version bump to 0.60.0
+ - removed renaming patches as uptream has renamed to ocsync
+ - fixed all refences from occsync and csync to ocsync
++>>>>>>> master
  * Mon Aug 20 2012 <jmarrero at fedoraproject.org> 0.50.8-9
  - Removed Patch modulesCMakeLists_namechange.patch to make modules compatible with Mirall runtime.
  * Sat Aug 18 2012 <jmarrero at fedoraproject.org> 0.50.8-8