rpms/isync/devel isync-1.0.3-open.patch, NONE, 1.1 isync.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/extras/rpms/isync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31494/devel

Modified Files:
	.cvsignore sources 
Added Files:
	isync-1.0.3-open.patch isync.spec 
Log Message:
Initial import

isync-1.0.3-open.patch:

--- NEW FILE isync-1.0.3-open.patch ---
diff -urp isync-1.0.3.orig/src/compat/convert.c isync-1.0.3/src/compat/convert.c
--- isync-1.0.3.orig/src/compat/convert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/compat/convert.c	2007-09-09 22:58:14.000000000 +0200
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
Pouze v isync-1.0.3/src/compat: convert.c.orig
diff -urp isync-1.0.3.orig/src/drv_maildir.c isync-1.0.3/src/drv_maildir.c
--- isync-1.0.3.orig/src/drv_maildir.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/drv_maildir.c	2007-09-09 23:01:55.000000000 +0200
@@ -497,7 +497,7 @@ maildir_scan( maildir_store_t *ctx, msgl
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -781,7 +781,7 @@ maildir_select( store_t *gctx, int minui
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff -urp isync-1.0.3.orig/src/mdconvert.c isync-1.0.3/src/mdconvert.c
--- isync-1.0.3.orig/src/mdconvert.c	2007-09-09 22:59:01.000000000 +0200
+++ isync-1.0.3/src/mdconvert.c	2007-09-09 23:02:16.000000000 +0200
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );


--- NEW FILE isync.spec ---
Name:           isync
Version:        1.0.3
Release:        3%{?dist}
Summary:        Tool to synchronize IMAP4 and Maildir mailboxes

Group:          Applications/Internet
License:        GPLv2+
URL:            http://isync.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         isync-1.0.3-open.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  db4-devel openssl-devel

%description
isync is a command line application which synchronizes mailboxes; currently
Maildir and IMAP4 mailboxes are supported.  New messages, message deletions
and flag changes can be propagated both ways.  isync is suitable for use in
IMAP-disconnected mode.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Remove copy of documentation files installed by package's buildsystem.
# Preverred over patching Makefile.am an regenerating Makefile.in due
# to robustness.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc/isync

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/isync
%{_bindir}/mbsync
%{_bindir}/mdconvert
%{_bindir}/get-cert
%{_mandir}/man1/*
%doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample

%changelog
* Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
- Fix code for the case where open() is a macro. (thanks to Marek Mahut)
- Cosmetic fixes. (#282261) (thanks to Till Maas)

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-2
- Added dependency on OpenSSL for SSL/TLS support

* Fri Sep 07 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Sep 2007 22:37:44 -0000	1.1
+++ .cvsignore	10 Sep 2007 09:47:07 -0000	1.2
@@ -0,0 +1 @@
+isync-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Sep 2007 22:37:44 -0000	1.1
+++ sources	10 Sep 2007 09:47:07 -0000	1.2
@@ -0,0 +1 @@
+b7331a3f4b541207e9ad70aa04f1a5ae  isync-1.0.3.tar.gz