rpms/multisync/FC-5 multisync-configure.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 multisync-rpath.patch, 1.2, 1.3 multisync.desktop, 1.1, 1.2 multisync.spec, 1.3, 1.4 sources, 1.3, 1.4
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Thu Dec 21 18:57:50 UTC 2006
- Previous message (by thread): rpms/multisync/FC-4 multisync-configure.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 multisync-rpath.patch, 1.2, 1.3 multisync.desktop, 1.1, 1.2 multisync.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message (by thread): rpms/multisync/FC-6 multisync-configure.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 multisync-rpath.patch, 1.2, 1.3 multisync.desktop, 1.1, 1.2 multisync.spec, 1.6, 1.7 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/extras/rpms/multisync/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15832/FC-5
Modified Files:
.cvsignore multisync-rpath.patch multisync.desktop
multisync.spec sources
Added Files:
multisync-configure.patch
Log Message:
- version upgrade
multisync-configure.patch:
--- NEW FILE multisync-configure.patch ---
--- src/wscript.orig 2006-12-21 18:40:22.000000000 +0100
+++ src/wscript 2006-12-21 18:41:06.000000000 +0100
@@ -8,16 +8,16 @@
# process file.pc.in -> file.pc
obj_rep = bld.create_obj('subst', 'uh')
obj_rep.source = 'multisync-gui.glade.in'
- obj_rep.target = 'multisync-gui.glade'
+ obj_rep.target = 'multisync.glade'
obj_gui = bld.create_obj('cc', 'program')
- obj_gui.target='multisync-gui'
+ obj_gui.target='multisync'
obj_gui.includes='.'
obj_gui.find_sources_in_dirs('. plugins')
obj_gui.defines='HAVE_CONFIG_H=1'
obj_gui.uselib = 'GLIB GTK GLADE OPENSYNC OPENSYNCENGINE'
- Common.install_files('MULTISYNC_DATA', '', 'multisync-gui.glade')
+ Common.install_files('MULTISYNC_DATA', '', 'multisync.glade')
else:
obj_gui = bld.create_obj('cc', 'program')
obj_gui.target='multisync-qad'
--- misc/wscript.orig 2006-12-21 18:41:42.000000000 +0100
+++ misc/wscript 2006-12-21 18:42:13.000000000 +0100
@@ -5,6 +5,6 @@
obj_rep = bld.create_obj('subst', 'uh')
obj_rep.source = 'multisync-gui.desktop.in'
obj_rep.target = 'multisync-qad.desktop'
- Common.install_files('PREFIX', 'share/pixmaps/multisync-gui/', 'multisync.png')
- Common.install_files('PREFIX', 'share/applications/', 'multisync-gui.desktop')
+ Common.install_files('PREFIX', 'share/pixmaps/multisync/', 'multisync.png')
+# Common.install_files('PREFIX', 'share/applications/', 'multisync.desktop')
--- wscript.orig 2006-12-21 18:52:05.000000000 +0100
+++ wscript 2006-12-21 18:53:32.000000000 +0100
@@ -6,7 +6,7 @@
# the following two variables are used by the target "waf dist"
VERSION='0.91.0'
-APPNAME='multisync-gui'
+APPNAME='multisync'
# these variables are mandatory ('/' are converted automatically)
srcdir = '.'
@@ -51,9 +51,10 @@
sys.exit(1)
conf.env['PREFIX'] = os.path.abspath(conf.env['PREFIX'])
if not Params.g_options.os_develop_mode :
- conf.env['MULTISYNC_DATA'] = os.path.join(conf.env['PREFIX'], 'share/multisync-gui')
- conf.env['MULTISYNC_ICON_DIR'] = os.path.join(conf.env['PREFIX'], 'share/pixmaps/multisync-gui')
- conf.add_define('MULTISYNC_GLADE', os.path.join(conf.env['MULTISYNC_DATA'], 'multisync-gui.glade'))
+ conf.env['MULTISYNC_DATA'] = os.path.join(conf.env['PREFIX'], 'share/multisync')
+ conf.env['MULTISYNC_ICON_DIR'] = os.path.join(conf.env['PREFIX'], 'share/pixmaps/multisync')
+ conf.add_define('MULTISYNC_ICON_DIR',conf.env['MULTISYNC_ICON_DIR'])
+ conf.add_define('MULTISYNC_GLADE', os.path.join(conf.env['MULTISYNC_DATA'], 'multisync.glade'))
conf.add_define('MULTISYNC_ICON', os.path.join(conf.env['MULTISYNC_ICON_DIR'], 'multisync.png'))
#Set project global include path
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 20 Oct 2006 10:57:51 -0000 1.3
+++ .cvsignore 21 Dec 2006 18:57:20 -0000 1.4
@@ -1,2 +1,2 @@
-multisync-gui-0.90.19.tar.gz
-msynctool-0.19.tar.gz
+multisync-gui-0.91.0.tar.gz
+msynctool-0.20.tar.gz
multisync-rpath.patch:
Index: multisync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/multisync-rpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multisync-rpath.patch 20 Oct 2006 10:57:51 -0000 1.2
+++ multisync-rpath.patch 21 Dec 2006 18:57:20 -0000 1.3
@@ -1,5 +1,5 @@
---- 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
+--- 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@
@@ -16,8 +16,8 @@
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
+--- 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 @@
## Process this file with automake to produce Makefile.in
@@ -38,3 +38,13 @@
man_MANS = convcard.1 msynctool.1
+--- SConstruct.orig 2006-12-20 12:48:26.000000000 +0100
++++ SConstruct 2006-12-20 12:53:49.000000000 +0100
+@@ -3,7 +3,4 @@
+ env.ParseConfig('pkg-config --cflags --libs libglade-2.0')
+ env.ParseConfig('pkg-config --cflags --libs opensync-1.0')
+ env.ParseConfig('pkg-config --cflags --libs osengine-1.0')
+-env.Append(CCFLAGS = r'-Wall')
+-env.Append(CCFLAGS = r'-Werror')
+-env.Append(LINKFLAGS = r' -Wl,--rpath -Wl,/usr/local/lib')
+ env.Program(['src/multisync.c', 'src/msync_env.c', 'src/msync_group.c', 'src/msync_plugin.c', 'src/msync_support.c', 'src/msync_callbacks.c', 'src/plugins/msync_default.c', 'src/plugins/msync_evo2sync.c'])
Index: multisync.desktop
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/multisync.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisync.desktop 13 Mar 2006 09:11:47 -0000 1.1
+++ multisync.desktop 21 Dec 2006 18:57:20 -0000 1.2
@@ -6,3 +6,4 @@
Type=Application
Encoding=UTF-8
Categories=Application;System;
+Icon=/usr/share/pixmaps/multisync/multisync.png
Index: multisync.spec
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/multisync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multisync.spec 20 Oct 2006 10:57:51 -0000 1.3
+++ multisync.spec 21 Dec 2006 18:57:20 -0000 1.4
@@ -1,5 +1,5 @@
Name: multisync
-Version: 0.90.19
+Version: 0.91.0
Release: 1%{?dist}
Summary: Calendar (and other PIM data) synchronization program
@@ -9,11 +9,12 @@
# see http://www.opensync.org/wiki/download
Source0: %{name}-gui-%{version}.tar.gz
Source1: %{name}.desktop
-Source2: msynctool-0.19.tar.gz
+Source2: msynctool-0.20.tar.gz
Patch0: multisync-rpath.patch
+Patch1: multisync-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libopensync-devel
+BuildRequires: libopensync-devel >= 0.20
BuildRequires: gnome-libs-devel
BuildRequires: libgnomeui-devel
BuildRequires: desktop-file-utils
@@ -22,6 +23,7 @@
BuildRequires: libopensync-plugin-palm-devel
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: dos2unix
%description
MultiSync is a program to synchronize calendars, addressbooks and other PIM
@@ -43,27 +45,29 @@
%setup -q -n multisync-gui-%{version}
tar xzvf %{SOURCE2}
%patch0
+%patch1
+dos2unix SConstruct
+echo "env.Append(CCFLAGS = '$RPM_OPT_FLAGS')" >> SConstruct
%build
# both don't like smp flags so disable them for now
-
-%configure --disable-static --disable-rpath
+./configure --prefix=%{_prefix} -v
%{__make}
# build gui
-cd msynctool-0.19
+cd msynctool-0.20
%configure --disable-static --disable-rpath
%{__make}
%install
rm -fr $RPM_BUILD_ROOT
-%makeinstall
-cd msynctool-0.19
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+cd msynctool-0.20
%makeinstall
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,}
+#mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.91,}
desktop-file-install \
--vendor=fedora \
@@ -71,12 +75,15 @@
--add-category=X-Fedora \
%{SOURCE1}
+sed -e's/multisync.png/\/usr\/share\/pixmaps\/multisync\/multisync.png/' -i \
+$RPM_BUILD_ROOT%{_datadir}/%{name}/multisync.glade
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root,-)
-%doc msynctool-0.19/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
+%doc msynctool-0.20/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
%{_bindir}/convcard
%{_bindir}/msynctool
%{_mandir}/man1/convcard*
@@ -84,11 +91,17 @@
%files gui
%defattr(-, root, root,-)
-%doc AUTHORS COPYING ChangeLog README COPYING
+%doc COPYING
%{_bindir}/multisync
+%{_datadir}/multisync/
+%{_datadir}/pixmaps/multisync/
%{_datadir}/applications/*desktop
%changelog
+* Wed Dec 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.91.0-1
+- version upgrade
+
* Fri Oct 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.90.19-1
- version upgrade
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multisync/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 20 Oct 2006 10:57:51 -0000 1.3
+++ sources 21 Dec 2006 18:57:20 -0000 1.4
@@ -1,2 +1,2 @@
-57bfe0f3375c8d6d5a86cb861d1eeeea multisync-gui-0.90.19.tar.gz
-5c7728254f2d634051af603e7d467832 msynctool-0.19.tar.gz
+3760eef2216f3905f21491b6b345d07f multisync-gui-0.91.0.tar.gz
+12070726e7883f72a1faab9c91fae259 msynctool-0.20.tar.gz
- Previous message (by thread): rpms/multisync/FC-4 multisync-configure.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 multisync-rpath.patch, 1.2, 1.3 multisync.desktop, 1.1, 1.2 multisync.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message (by thread): rpms/multisync/FC-6 multisync-configure.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 multisync-rpath.patch, 1.2, 1.3 multisync.desktop, 1.1, 1.2 multisync.spec, 1.6, 1.7 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list