[owncloud-csync] Update to ocsync-0.60.0

Sun Oct 14 19:58:54 UTC 2012

commit 67d02bcd0aeff1b219322e3699c9e26ca5e3ae03
Author: Joseph <joseph at localhost.localdomain>
Date:   Sun Oct 14 19:58:38 2012 +0000

    Update to ocsync-0.60.0

 .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               |  103 ++++++++++++++-----------------------
 rootCMakeLists_namechange.patch   |    8 ---
 sources                           |    2 +-
 srcCMakeLists_namechange.patch    |   17 ------
 9 files changed, 40 insertions(+), 150 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6472078..4bcfa75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /csync-0.50.8.tar.bz2
+/ocsync-0.60.0.tar.bz2
diff --git a/owncloud-csync.spec b/owncloud-csync.spec
index 7c36c3c..bdd5047 100644
--- a/owncloud-csync.spec
+++ b/owncloud-csync.spec
@@ -1,20 +1,10 @@
 Name:           owncloud-csync
-Version:        0.50.8
-Release:        9%{?dist}
+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/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
-
+Source0:        http://download.owncloud.com/download/ocsync-%{version}.tar.bz2
 
 BuildRequires:  check
 BuildRequires:  cmake
@@ -28,33 +18,25 @@ BuildRequires:  sqlite-devel
 BuildRequires:  openssl-devel
 
 %description
-csync is an implementation of a file synchronizer which provides the
-feature of roaming home directories for Linux clients. csync makes use
+ocsync is an implementation of a file synchronizer which provides the
+feature of roaming home directories for Linux clients. ocsync makes use
 of libsmbclient in Samba/Windows environments.
 
 %package libs
 Summary: A user level bidirectional client only file synchronizer
 
 %description libs
-csync is an implementation of a file synchronizer which provides the
-feature of roaming home directories for Linux clients. csync makes use
+ocsync is an implementation of a file synchronizer which provides the
+feature of roaming home directories for Linux clients. ocsync makes use
 of libsmbclient in Samba/Windows environments.
 
-%package plugin-smb
-Summary:        SMB plugin for csync
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description plugin-smb
-This plug-in allows applications using csync to synchronize with a
-Samba or Windows server.
-
 %package plugin-sftp
 Summary:        A user level bidirectional client only file synchronizer
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description plugin-sftp
-csync is an implementation of a file synchronizer which provides the
-feature of roaming home directories for clients. csync makes use
+ocsync is an implementation of a file synchronizer which provides the
+feature of roaming home directories for clients. ocsync makes use
 of libsmbclient in Samba/Windows environments.
 
 %package plugin-owncloud
@@ -62,45 +44,35 @@ Summary:        A user level bidirectional client only file synchronizer
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description plugin-owncloud
-csync is an implementation of a file synchronizer which provides the
-feature of roaming home directories for Linux clients. csync makes use
+ocsync is an implementation of a file synchronizer which provides the
+feature of roaming home directories for Linux clients. ocsync makes use
 of libneon to access ownCloud. 
 
 %package devel
-Summary:        Development files for csync
+Summary:        Development files for ocsync
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
-The csync-devel package contains the static libraries and header
-files needed for development with csync.
+The ocsync-devel package contains the static libraries and header
+files needed for development with ocsync.
 
 %package devel-doc
 BuildArch: noarch
-Summary: Developer documentation for csync
+Summary: Developer documentation for ocsync
 
 %description devel-doc
-The csync-devel-doc package provides documentation for csync
+The ocsync-devel-doc package provides documentation for ocsync
 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
-%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}
 
 %build
 if test ! -e "build"; then
@@ -112,7 +84,7 @@ pushd build
   -DLOG_TO_CALLBACK=ON \
   -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  %{_builddir}/csync-%{version}
+  %{_builddir}/ocsync-%{version}
 make %{?_smp_mflags} %{?jobs:-j%jobs} VERBOSE=1
 make doc
 popd build
@@ -122,8 +94,8 @@ pushd build
 make DESTDIR=%{buildroot} install
 
 mkdir -p %{buildroot}%{_docdir}/%{name}-devel-%{version}/
-mv %{_builddir}/csync-%{version}/build/doc/html %{buildroot}%{_docdir}/%{name}-devel-%{version}/html
-mv %{buildroot}%{_docdir}/occsync %{buildroot}%{_docdir}/%{name}-%{version}/
+mv %{_builddir}/ocsync-%{version}/build/doc/html %{buildroot}%{_docdir}/%{name}-devel-%{version}/html
+mv %{buildroot}%{_docdir}/ocsync %{buildroot}%{_docdir}/%{name}-%{version}/
 
 popd build
 
@@ -132,30 +104,27 @@ popd build
 %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
-%dir %{_sysconfdir}/occsync
-%{_libdir}/liboccsync.so.*
-%dir %{_libdir}/occsync-0
-
-%files plugin-smb
-%{_libdir}/occsync-0/csync_smb.so
+%dir %{_sysconfdir}/ocsync
+%{_libdir}/libocsync.so.*
+%dir %{_libdir}/ocsync-0
 
 %files plugin-sftp
-%{_libdir}/occsync-0/csync_sftp.so
+%{_libdir}/ocsync-0/ocsync_sftp.so
 
 %files plugin-owncloud
-%{_libdir}/occsync-0/csync_owncloud.so
+%{_libdir}/ocsync-0/ocsync_owncloud.so
 
 %files devel
-%{_includedir}/occsync
-%{_libdir}/liboccsync.so
+%{_includedir}/ocsync
+%{_libdir}/libocsync.so
 
 %files devel-doc
 %{_docdir}/%{name}-devel-%{version}/html
@@ -164,6 +133,10 @@ popd build
 %{_docdir}/%{name}-%{version}
 
 %changelog
+* 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
 * 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
diff --git a/sources b/sources
index 3ee2d25..06b458c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-322f6fa22ca0e8cd05f23dc0d075e7ca  csync-0.50.8.tar.bz2
+426f775b2d99d6c27ac413d67ac8dd2a  ocsync-0.60.0.tar.bz2
