rpms/multisync/FC-6 .cvsignore, 1.4, 1.5 multisync-rpath.patch, 1.3, 1.4 multisync.spec, 1.7, 1.8 sources, 1.4, 1.5

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	.cvsignore multisync-rpath.patch multisync.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2006 18:57:25 -0000	1.4
+++ .cvsignore	25 Apr 2007 16:27:12 -0000	1.5
@@ -1,2 +1,2 @@
 multisync-gui-0.91.0.tar.gz
-msynctool-0.20.tar.gz
+msynctool-0.22.tar.bz2

multisync-rpath.patch:

Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-6/multisync-rpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multisync-rpath.patch	21 Dec 2006 18:57:25 -0000	1.3
+++ multisync-rpath.patch	25 Apr 2007 16:27:12 -0000	1.4
@@ -1,11 +1,7 @@
---- msynctool-0.20/tools/Makefile.in.orig	2006-10-20 12:42:27.000000000 +0200
-+++ msynctool-0.20/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)
+--- msynctool-0.22/tools/Makefile.in.orig	2007-04-25 18:16:39.000000000 +0200
++++ msynctool-0.22/tools/Makefile.in	2007-04-25 18:17:05.000000000 +0200
+@@ -188,11 +188,11 @@
+ AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
  INCLUDES = @PACKAGE_CFLAGS@
  msynctool_SOURCES = msynctool.c
 -msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
@@ -13,12 +9,15 @@
  convcard_SOURCES = convcard.c
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
 +convcard_LDFLAGS = @PACKAGE_LIBS@
+ convtest_SOURCES = convtest.c
+-convtest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convtest_LDFLAGS = @PACKAGE_LIBS@
  man_MANS = convcard.1 msynctool.1
  EXTRA_DIST = $(man_MANS)
  all: all-am
---- msynctool-0.20/tools/Makefile.am.orig	2006-10-20 12:42:24.000000000 +0200
-+++ msynctool-0.20/tools/Makefile.am	2006-10-20 12:42:45.000000000 +0200
-@@ -1,16 +1,16 @@
+--- msynctool-0.22/tools/Makefile.am.orig	2007-04-25 18:17:18.000000000 +0200
++++ msynctool-0.22/tools/Makefile.am	2007-04-25 18:18:22.000000000 +0200
+@@ -1,19 +1,19 @@
  ## Process this file with automake to produce Makefile.in
  
 -AM_CFLAGS = -Wall -Werror -I$(top_srcdir)
@@ -26,7 +25,7 @@
  
  INCLUDES = @PACKAGE_CFLAGS@
  
- bin_PROGRAMS = msynctool convcard
+ bin_PROGRAMS = msynctool convcard convtest
  
  msynctool_SOURCES = msynctool.c
 -msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
@@ -36,10 +35,14 @@
 -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
 +convcard_LDFLAGS = @PACKAGE_LIBS@
  
- man_MANS = convcard.1 msynctool.1
+ convtest_SOURCES = convtest.c
+-convtest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
++convtest_LDFLAGS = @PACKAGE_LIBS@
  
---- SConstruct.orig	2006-12-20 12:48:26.000000000 +0100
-+++ SConstruct	2006-12-20 12:53:49.000000000 +0100
+ man_MANS = convcard.1 msynctool.1
+
+--- SConstruct.orig	2007-04-25 18:22:41.000000000 +0200
++++ SConstruct	2007-04-25 18:22:46.000000000 +0200
 @@ -3,7 +3,4 @@
  env.ParseConfig('pkg-config --cflags --libs libglade-2.0')
  env.ParseConfig('pkg-config --cflags --libs opensync-1.0')


Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-6/multisync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- multisync.spec	21 Dec 2006 18:57:25 -0000	1.7
+++ multisync.spec	25 Apr 2007 16:27:12 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           multisync
 Version:        0.91.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Calendar (and other PIM data) synchronization program
 
 Group:          Applications/Communications
@@ -9,12 +9,12 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-gui-%{version}.tar.gz
 Source1:        %{name}.desktop
-Source2:        msynctool-0.20.tar.gz
+Source2:        msynctool-0.22.tar.bz2
 Patch0:         multisync-rpath.patch
 Patch1:         multisync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libopensync-devel >= 0.20
+BuildRequires:  libopensync-devel >= 0.22
 BuildRequires:  gnome-libs-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  desktop-file-utils
@@ -23,7 +23,6 @@
 BuildRequires:  libopensync-plugin-palm-devel
 BuildRequires:  automake
 BuildRequires:  libtool
-BuildRequires:  dos2unix
 
 %description
 MultiSync is a program to synchronize calendars, addressbooks and other PIM
@@ -43,10 +42,9 @@
 
 %prep
 %setup -q -n multisync-gui-%{version}
-tar xzvf %{SOURCE2}
+tar xjvf %{SOURCE2}
 %patch0
 %patch1
-dos2unix SConstruct
 echo "env.Append(CCFLAGS = '$RPM_OPT_FLAGS')" >> SConstruct
 
 %build
@@ -55,14 +53,14 @@
 %{__make}
 
 # build gui
-cd msynctool-0.20
+cd msynctool-0.22
 %configure --disable-static --disable-rpath
 %{__make}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-cd msynctool-0.20
+cd msynctool-0.22
 %makeinstall
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -83,9 +81,10 @@
 
 %files
 %defattr(-, root, root,-)
-%doc msynctool-0.20/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
+%doc msynctool-0.22/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
 %{_bindir}/convcard
 %{_bindir}/msynctool
+%{_bindir}/convtest
 %{_mandir}/man1/convcard*
 %{_mandir}/man1/msynctool*
 
@@ -98,6 +97,10 @@
 %{_datadir}/applications/*desktop
 
 %changelog
+* Wed Apr 25 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.91.0-2
+- upgrade msynctool
+
 * Wed Dec 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.91.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2006 18:57:25 -0000	1.4
+++ sources	25 Apr 2007 16:27:12 -0000	1.5
@@ -1,2 +1,2 @@
 3760eef2216f3905f21491b6b345d07f  multisync-gui-0.91.0.tar.gz
-12070726e7883f72a1faab9c91fae259  msynctool-0.20.tar.gz
+3ddc55209e682a8b99a47cf3d0053dbf  msynctool-0.22.tar.bz2