rpms/multisync/FC-4 .cvsignore, 1.2, 1.3 multisync-rpath.patch, 1.1, 1.2 multisync.spec, 1.2, 1.3 sources, 1.2, 1.3 multisync-gui-svn151.patch, 1.1, NONE multisync-tool.patch, 1.1, NONE multisync-werror.patch, 1.1, NONE

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/multisync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/FC-4

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Removed Files:
	multisync-gui-svn151.patch multisync-tool.patch 
	multisync-werror.patch 
Log Message:
- version upgrade
- should fix #187288,#187319,#188250,#196412



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2006 09:11:47 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:57:50 -0000	1.3
@@ -1 +1,2 @@
-multisync-0.90.18.tar.gz
+multisync-gui-0.90.19.tar.gz
+msynctool-0.19.tar.gz

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync-rpath.patch	13 Mar 2006 09:11:47 -0000	1.1
+++ multisync-rpath.patch	20 Oct 2006 10:57:50 -0000	1.2
@@ -1,6 +1,24 @@
---- tools/Makefile.am.orig	2005-11-29 14:43:23.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 14:46:18.000000000 +0100
-@@ -1,13 +1,13 @@
+--- msynctool-0.19/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
++++ msynctool-0.19/tools/Makefile.in	2006-10-20 12:43:04.000000000 +0200
+@@ -181,12 +181,12 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(top_srcdir)
+ INCLUDES = @PACKAGE_CFLAGS@
+ msynctool_SOURCES = msynctool.c
+-msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++msynctool_LDFLAGS = @PACKAGE_LIBS@
+ convcard_SOURCES = convcard.c
+-convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convcard_LDFLAGS = @PACKAGE_LIBS@
+ man_MANS = convcard.1 msynctool.1
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+--- msynctool-0.19/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
++++ msynctool-0.19/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
+@@ -1,16 +1,16 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -16,5 +34,7 @@
  
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
-\ No newline at end of file
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ 
+ man_MANS = convcard.1 msynctool.1
+ 


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/multisync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multisync.spec	17 Mar 2006 10:58:01 -0000	1.2
+++ multisync.spec	20 Oct 2006 10:57:50 -0000	1.3
@@ -1,19 +1,16 @@
 Name:           multisync
-Version:        0.90.18
-Release:        5%{?dist}
+Version:        0.90.19
+Release:        1%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.opensync.org
 # see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
+Source2:        msynctool-0.19.tar.gz
 Patch0:         multisync-rpath.patch
-# this is svn151 with a few fixes
-Patch1:         multisync-gui-svn151.patch
-Patch2:         multisync-werror.patch
-Patch3:         multisync-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -22,12 +19,15 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libopensync-plugin-evolution2-devel
 BuildRequires:  automake
+BuildRequires:  libtool
 
 %description
 MultiSync is a program to synchronize calendars, addressbooks and other PIM
 data between programs on your computer and other computers, mobile devices,
 PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC
 mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup.
+For proper use, please install the desired plugins found in the
+libopensync-plugin-* packages.
 
 %package gui
 Summary:  GUI interface for multisync
@@ -38,37 +38,31 @@
 Graphical User Interface for multisync
 
 %prep
-%setup -q
+%setup -q -n multisync-gui-%{version}
+tar xzvf %{SOURCE2}
 %patch0
-%patch1
-%patch2
-%patch3 -p1
 
 %build
 # both don't like smp flags so disable them for now
 
-NOCONFIGURE=true ./autogen.sh
-%configure --disable-static
+%configure --disable-static --disable-rpath
 %{__make}
 
 # build gui
-cd gui
-autoreconf -sfi 
+cd msynctool-0.19
 %configure --disable-static --disable-rpath
-# if we don't do a make clean here we only get a segfaulting binary
-%{__make} clean
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %makeinstall
-cd gui
+cd msynctool-0.19
 %makeinstall
 
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -80,17 +74,24 @@
 
 %files
 %defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_mandir}/man1/convcard*
+%{_mandir}/man1/msynctool*
 
 %files gui
 %defattr(-, root, root,-)
-%doc COPYING
+%doc AUTHORS COPYING ChangeLog README COPYING
 %{_bindir}/multisync
 %{_datadir}/applications/*desktop
 
 %changelog
+* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.90.19-1
+- version upgrade
+- should fix #187288,#187319,#196412
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.90.18-5
 - fix #185631


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2006 09:11:47 -0000	1.2
+++ sources	20 Oct 2006 10:57:50 -0000	1.3
@@ -1 +1,2 @@
-d55d8eaeecb825b87a25eeceaef92cb9  multisync-0.90.18.tar.gz
+57bfe0f3375c8d6d5a86cb861d1eeeea  multisync-gui-0.90.19.tar.gz
+5c7728254f2d634051af603e7d467832  msynctool-0.19.tar.gz


--- multisync-gui-svn151.patch DELETED ---


--- multisync-tool.patch DELETED ---


--- multisync-werror.patch DELETED ---