rpms/libopensync/FC-3 .cvsignore, 1.2, 1.3 libopensync-rpath.patch, 1.1, 1.2 libopensync.spec, 1.4, 1.5 sources, 1.2, 1.3 libopensync-configure.patch, 1.1, NONE

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Fri Oct 20 10:06:43 UTC 2006


Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10100/FC-3

Modified Files:
	.cvsignore libopensync-rpath.patch libopensync.spec sources 
Removed Files:
	libopensync-configure.patch 
Log Message:
- version upgrade #210443 #209281



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
+++ .cvsignore	20 Oct 2006 10:06:12 -0000	1.3
@@ -1 +1 @@
-libopensync-0.18.tar.gz
+libopensync-0.19.tar.gz

libopensync-rpath.patch:

Index: libopensync-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-rpath.patch	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync-rpath.patch	20 Oct 2006 10:06:12 -0000	1.2
@@ -1,5 +1,374 @@
---- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
-+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
+--- formats/Makefile.am.orig	2006-10-12 20:03:03.000000000 +0200
++++ formats/Makefile.am	2006-10-12 20:03:32.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ 
+ formatsdir=@OPENSYNC_FORMATSDIR@
+ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+--- formats/Makefile.in.orig	2006-10-12 20:03:06.000000000 +0200
++++ formats/Makefile.in	2006-10-12 20:05:42.000000000 +0200
+@@ -255,7 +255,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
++AM_CFLAGS = -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\" -Wall @XML_CFLAGS@ @GCOV_CFLAGS@
+ formatsdir = @OPENSYNC_FORMATSDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ opensyncheader_HEADERS = file.h
+@@ -341,17 +341,17 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ contact.la: $(contact_la_OBJECTS) $(contact_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
++	$(LINK) $(contact_la_LDFLAGS) $(contact_la_OBJECTS) $(contact_la_LIBADD) $(LIBS)
+ data.la: $(data_la_OBJECTS) $(data_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
++	$(LINK) $(data_la_LDFLAGS) $(data_la_OBJECTS) $(data_la_LIBADD) $(LIBS)
+ event.la: $(event_la_OBJECTS) $(event_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
++	$(LINK) $(event_la_LDFLAGS) $(event_la_OBJECTS) $(event_la_LIBADD) $(LIBS)
+ file.la: $(file_la_OBJECTS) $(file_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
++	$(LINK) $(file_la_LDFLAGS) $(file_la_OBJECTS) $(file_la_LIBADD) $(LIBS)
+ note.la: $(note_la_OBJECTS) $(note_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
++	$(LINK) $(note_la_LDFLAGS) $(note_la_OBJECTS) $(note_la_LIBADD) $(LIBS)
+ todo.la: $(todo_la_OBJECTS) $(todo_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(formatsdir) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
++	$(LINK) $(todo_la_LDFLAGS) $(todo_la_OBJECTS) $(todo_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- opensync/Makefile.am.orig	2006-10-12 19:55:32.000000000 +0200
++++ opensync/Makefile.am	2006-10-12 19:56:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = @PACKAGE_CFLAGS@
+ 
+--- opensync/Makefile.in.orig	2006-10-12 19:55:34.000000000 +0200
++++ opensync/Makefile.in	2006-10-12 20:01:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = @PACKAGE_CFLAGS@
+ lib_LTLIBRARIES = libopensync.la
+ opensyncincludedir = @OPENSYNC_HEADERDIR@
+@@ -369,7 +369,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libopensync.la: $(libopensync_la_OBJECTS) $(libopensync_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
++	$(LINK) $(libopensync_la_LDFLAGS) $(libopensync_la_OBJECTS) $(libopensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osengine/Makefile.am.orig	2006-10-12 20:04:25.000000000 +0200
++++ osengine/Makefile.am	2006-10-12 20:04:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ 
+@@ -43,5 +43,5 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- osengine/Makefile.in.orig	2006-10-12 20:04:27.000000000 +0200
++++ osengine/Makefile.in	2006-10-12 20:05:18.000000000 +0200
+@@ -63,7 +63,6 @@
+ 	osengine_status.lo osengine_debug.lo osengine_mapping.lo \
+ 	osengine_mapcmds.lo osengine_deciders.lo osengine_flags.lo
+ libosengine_la_OBJECTS = $(am_libosengine_la_OBJECTS)
+- at BUILD_ENGINE_TRUE@am_libosengine_la_rpath = -rpath $(libdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -235,7 +234,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
++AM_CFLAGS = -Wall @GCOV_CFLAGS@
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
+ @BUILD_ENGINE_TRUE at lib_LTLIBRARIES = libosengine.la
+ @BUILD_ENGINE_TRUE at osengineincludedir = @OPENSYNC_ENGINEHEADERDIR@
+@@ -271,7 +270,7 @@
+ 	*.bbg \
+ 	*.da
+ 
+-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
++libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
+ libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -334,7 +333,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libosengine.la: $(libosengine_la_OBJECTS) $(libosengine_la_DEPENDENCIES) 
+-	$(LINK) $(am_libosengine_la_rpath) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
++	$(LINK) $(libosengine_la_LDFLAGS) $(libosengine_la_OBJECTS) $(libosengine_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+--- osplugin/Makefile.am.orig	2006-10-12 20:05:55.000000000 +0200
++++ osplugin/Makefile.am	2006-10-12 20:06:55.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ 
+@@ -9,7 +9,7 @@
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ 
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ 
+ CLEANFILES = \
+--- osplugin/Makefile.in.orig	2006-10-12 20:06:00.000000000 +0200
++++ osplugin/Makefile.in	2006-10-12 20:07:13.000000000 +0200
+@@ -220,11 +220,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall @XML_CFLAGS@ -Werror @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
++AM_CFLAGS = -Wall @XML_CFLAGS@ @GCOV_CFLAGS@ -DOPENSYNC_PLUGINDIR=\"@OPENSYNC_PLUGINDIR@\" -DOPENSYNC_CONFIGDIR=\"@OPENSYNC_CONFIGDIR@\" -DOPENSYNC_FORMATSDIR=\"@OPENSYNC_FORMATSDIR@\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine -I$(top_srcdir)/opensync
+ ospluginincludedir = @OPENSYNC_HEADERDIR@
+ osplugin_SOURCES = osplugin.c
+-osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
++osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
+ osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.am.orig	2006-10-12 20:07:23.000000000 +0200
++++ tests/Makefile.am	2006-10-12 20:08:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = mock-plugin
+ 
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ 
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ 
+@@ -25,82 +25,82 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ 
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ 
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ 
+ CLEANFILES = \
+ 	*.bb \
+--- tests/Makefile.in.orig	2006-10-12 20:07:26.000000000 +0200
++++ tests/Makefile.in	2006-10-12 20:11:05.000000000 +0200
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = mock-plugin
+-AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
++AM_CFLAGS = @XML_CFLAGS@ -Wall @GCOV_CFLAGS@ -DOPENSYNC_TESTDATA=\"$(srcdir)/\"
+ INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
+ EXTRA_DIST = \
+ 	data \
+@@ -300,67 +300,67 @@
+ error_INCLUDES = @CHECK_CFLAGS@
+ error_SOURCES = check_error.c
+ error_LIBS = @CHECK_LIBS@
+-error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++error_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ ipc_INCLUDES = @CHECK_CFLAGS@
+ ipc_SOURCES = check_ipc.c support.c
+ ipc_LIBS = @CHECK_LIBS@
+-ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++ipc_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ member_INCLUDES = @CHECK_CFLAGS@
+ member_SOURCES = check_member.c
+ member_LIBS = @CHECK_LIBS@
+-member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++member_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck  @GCOV_LDFLAGS@
+ group_INCLUDES = @CHECK_CFLAGS@
+ group_SOURCES = check_group.c support.c
+ group_LIBS = @CHECK_LIBS@
+-group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck -R $(libdir) @GCOV_LDFLAGS@
++group_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la  -lcheck @GCOV_LDFLAGS@
+ plugin_INCLUDES = @CHECK_CFLAGS@
+ plugin_SOURCES = check_plugins.c support.c
+ plugin_LIBS = @CHECK_LIBS@
+-plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++plugin_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ locks_INCLUDES = @CHECK_CFLAGS@
+ locks_SOURCES = check_lock.c support.c
+ locks_LIBS = @CHECK_LIBS@
+-locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++locks_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ env_INCLUDES = @CHECK_CFLAGS@
+ env_SOURCES = check_env.c support.c
+ env_LIBS = @CHECK_LIBS@
+-env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++env_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ user_INCLUDES = @CHECK_CFLAGS@
+ user_SOURCES = check_user.c
+ user_LIBS = @CHECK_LIBS@
+-user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++user_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la -lcheck @GCOV_LDFLAGS@
+ conv_INCLUDES = @CHECK_CFLAGS@
+ conv_SOURCES = check_conv.c support.c
+ conv_LIBS = @CHECK_LIBS@
+-conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++conv_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ sync_INCLUDES = @CHECK_CFLAGS@
+ sync_SOURCES = check_sync.c support.c
+ sync_LIBS = @CHECK_LIBS@
+-sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++sync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ filter_INCLUDES = @CHECK_CFLAGS@
+ filter_SOURCES = check_filter.c support.c
+ filter_LIBS = @CHECK_LIBS@
+-filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++filter_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ multisync_INCLUDES = @CHECK_CFLAGS@
+ multisync_SOURCES = check_multisync.c support.c
+ multisync_LIBS = @CHECK_LIBS@
+-multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++multisync_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcard_INCLUDES = @CHECK_CFLAGS@
+ vcard_SOURCES = check_vcard.c support.c
+ vcard_LIBS = @CHECK_LIBS@
+-vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcard_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vcal_INCLUDES = @CHECK_CFLAGS@
+ vcal_SOURCES = check_vcal.c support.c
+ vcal_LIBS = @CHECK_LIBS@
+-vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vcal_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ vnote_INCLUDES = @CHECK_CFLAGS@
+ vnote_SOURCES = check_vnote.c support.c
+ vnote_LIBS = @CHECK_LIBS@
+-vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++vnote_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ errorcodes_INCLUDES = @CHECK_CFLAGS@
+ errorcodes_SOURCES = check_codes.c support.c
+ errorcodes_LIBS = @CHECK_LIBS@
+-errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck -R $(libdir) @GCOV_LDFLAGS@
++errorcodes_LDFLAGS = @PACKAGE_LIBS@ $(top_builddir)/opensync/libopensync.la $(top_builddir)/osengine/libosengine.la -lcheck @GCOV_LDFLAGS@
+ CLEANFILES = \
+ 	*.bb \
+ 	*.bbg \
+--- tools/Makefile.am.orig	2006-10-12 20:11:16.000000000 +0200
++++ tools/Makefile.am	2006-10-12 20:12:06.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -37,58 +406,14 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  
  CLEANFILES = \
---- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
-+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+--- tools/Makefile.in.orig	2006-10-12 20:11:20.000000000 +0200
++++ tools/Makefile.in	2006-10-12 20:12:38.000000000 +0200
+@@ -240,22 +240,22 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 +AM_CFLAGS = -Wall @GCOV_CFLAGS@
- 
- INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
- 
-@@ -47,5 +47,5 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
-+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
-@@ -270,7 +270,7 @@
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
-+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
- libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
-+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
-@@ -22,5 +22,5 @@
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
---- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
-+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
-@@ -235,7 +235,7 @@
- @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
- @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
-+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
- _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
- all: all-am
- 
---- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
-+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
-@@ -237,19 +237,19 @@
- AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
  INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
  osyncdump_SOURCES = osyncdump.c
 -osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
@@ -112,3 +437,65 @@
  osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
  CLEANFILES = \
  	*.bb \
+--- wrapper/Makefile.am.orig	2006-10-12 20:12:52.000000000 +0200
++++ wrapper/Makefile.am	2006-10-12 20:13:20.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ 
+ INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ 
+@@ -22,5 +22,5 @@
+ endif
+ 
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+--- wrapper/Makefile.in.orig	2006-10-12 20:12:55.000000000 +0200
++++ wrapper/Makefile.in	2006-10-12 20:13:51.000000000 +0200
+@@ -58,7 +58,6 @@
+ _opensync_la_DEPENDENCIES = $(top_builddir)/opensync/libopensync.la
+ nodist__opensync_la_OBJECTS = opensync_wrap.lo
+ _opensync_la_OBJECTS = $(nodist__opensync_la_OBJECTS)
+- at HAVE_PYTHON_TRUE@am__opensync_la_rpath = -rpath $(osbindingsdir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -228,7 +227,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-AM_CFLAGS = -Werror
++AM_CFLAGS = -Wall
+ INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
+ EXTRA_DIST = opensync.i
+ CLEANFILES = \
+@@ -241,7 +240,7 @@
+ @HAVE_PYTHON_TRUE at osbindingsdir = $(pyexecdir)
+ @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
+ nodist__opensync_la_SOURCES = opensync_wrap.c
+-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
++_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module -avoid-version
+ _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
+ all: all-am
+ 
+@@ -304,7 +303,7 @@
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ _opensync.la: $(_opensync_la_OBJECTS) $(_opensync_la_DEPENDENCIES) 
+-	$(LINK) $(am__opensync_la_rpath) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
++	$(LINK) $(_opensync_la_LDFLAGS) $(_opensync_la_OBJECTS) $(_opensync_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -548,7 +547,7 @@
+ 
+ 
+ opensync_wrap.c: $(srcdir)/opensync.i
+-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
++	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync.spec	13 Dec 2005 13:46:20 -0000	1.4
+++ libopensync.spec	20 Oct 2006 10:06:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libopensync
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -9,7 +9,6 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
-Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -19,6 +18,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  autoconf
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
+autoreconf
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -51,7 +51,7 @@
 done
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +84,7 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_libexecdir}/osplugin
 %dir %{_libdir}/opensync
 %dir %{_libdir}/opensync/formats
 %dir %{_libdir}/opensync/plugins
@@ -100,10 +101,15 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 12 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.19-1
+- version upgrade #210443 #209281
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-5
 - change handling of ld.so.conf files
 - patch configure for x86_64 python
+- add wrapper compile patch (no Werror)
 
 * Sun Dec 11 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2005 21:58:44 -0000	1.2
+++ sources	20 Oct 2006 10:06:12 -0000	1.3
@@ -1 +1 @@
-ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz
+9475641b4670cb70d46ee2ac4c146009  libopensync-0.19.tar.gz


--- libopensync-configure.patch DELETED ---




More information about the fedora-extras-commits mailing list