rpms/libical/devel libical-0.40-makefile.patch, NONE, 1.1 libical.spec, 1.10, 1.11 libical-0.32-makefile.patch, 1.1, NONE

Kevin Kofler kkofler at fedoraproject.org
Tue Oct 28 05:25:08 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/libical/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2525/devel

Modified Files:
	libical.spec 
Added Files:
	libical-0.40-makefile.patch 
Removed Files:
	libical-0.32-makefile.patch 
Log Message:
- Update makefile patch, remove the test part (already applied).

libical-0.40-makefile.patch:

--- NEW FILE libical-0.40-makefile.patch ---
diff -ur libical-0.40/src/libical/Makefile.in libical-0.40-makefile/src/libical/Makefile.in
--- libical-0.40/src/libical/Makefile.in	2008-10-06 04:43:31.000000000 +0200
+++ libical-0.40-makefile/src/libical/Makefile.in	2008-10-28 06:17:21.000000000 +0100
@@ -105,7 +105,7 @@
 	icalduration.lo icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo \
 	sspm.lo vsnprintf.lo icallangbind.lo caldate.lo
 libical_la_OBJECTS = $(am_libical_la_OBJECTS)
-libical_cxx_la_LIBADD =
+libical_cxx_la_LIBADD = $(PTHREAD_LIBS)
 am__libical_cxx_la_SOURCES_DIST = icalderivedparameter.h \
 	icalderivedproperty.h icalderivedvalue.h \
 	icalderivedparameter.c icalderivedproperty.c icalrestriction.c \
diff -ur libical-0.40/src/libicalss/Makefile.in libical-0.40-makefile/src/libicalss/Makefile.in
--- libical-0.40/src/libicalss/Makefile.in	2008-10-06 04:43:33.000000000 +0200
+++ libical-0.40-makefile/src/libicalss/Makefile.in	2008-10-28 06:18:49.000000000 +0100
@@ -102,7 +102,6 @@
 	icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1) \
 	$(am__objects_2)
 libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS)
-libicalss_cxx_la_LIBADD =
 am__libicalss_cxx_la_SOURCES_DIST = icalspanlist_cxx.h \
 	icalspanlist_cxx.cpp
 @WITH_CXX_BINDINGS_TRUE at am_libicalss_cxx_la_OBJECTS =  \
@@ -308,7 +307,7 @@
 	$(BDB_INCLUDE)
 
 libicalss_la_LDFLAGS = -version-info 40:0:40
-libicalss_la_LIBADD = $(BDB_LIBFILES) 
+libicalss_la_LIBADD = $(BDB_LIBFILES) ../libical/libical.la
 @DEV_FALSE at libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
 @DEV_TRUE at libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
 libicalss_la_SOURCES = \
@@ -351,6 +350,8 @@
 	$(srcdir)/icalspanlist.h	\
 	$(srcdir)/icalmessage.h
 
+libicalss_cxx_la_LIBADD = ./libicalss.la ../libical/libical_cxx.la
+libicalss_cxx_la_DEPENDENCIES = ./libicalss.la ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at libicalss_cxx_la_SOURCES = \
 @WITH_CXX_BINDINGS_TRUE@	$(libicalss_evolution_la_SOURCES)	\
 @WITH_CXX_BINDINGS_TRUE@	icalspanlist_cxx.h	\


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libical.spec	28 Oct 2008 05:07:56 -0000	1.10
+++ libical.spec	28 Oct 2008 05:24:38 -0000	1.11
@@ -117,6 +117,7 @@
 * Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.40-1
 - Update to 0.40.
 - Add patch from upstream to fix crash in icalvalue.c.
+- Update makefile patch, remove the test part (already applied).
 
 * Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
 - Version bump to 0.32.


--- libical-0.32-makefile.patch DELETED ---




More information about the fedora-extras-commits mailing list