rpms/libical/F-9 libical-0.32-makefile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libical.spec, 1.8, 1.9 sources, 1.4, 1.5 libical-0.31-makefile.patch, 1.1, NONE

[Debarshi Ray]

Author: rishi

Update of /cvs/pkgs/rpms/libical/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9965

Modified Files:
	.cvsignore libical.spec sources 
Added Files:
	libical-0.32-makefile.patch 
Removed Files:
	libical-0.31-makefile.patch 
Log Message:
* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
- Version bump to 0.32.
- Parallel build problems fixed.


libical-0.32-makefile.patch:

--- NEW FILE libical-0.32-makefile.patch ---
diff -urNp libical-0.32.orig/src/libical/Makefile.in libical-0.32/src/libical/Makefile.in
--- libical-0.32.orig/src/libical/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libical/Makefile.in	2008-09-02 20:02:36.195993974 +0530
@@ -103,7 +103,7 @@ am_libical_la_OBJECTS = $(am__objects_2)
 	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 -urNp libical-0.32.orig/src/libicalss/Makefile.in libical-0.32/src/libicalss/Makefile.in
--- libical-0.32.orig/src/libicalss/Makefile.in	2008-09-02 00:06:16.000000000 +0530
+++ libical-0.32/src/libicalss/Makefile.in	2008-09-02 21:56:38.509744465 +0530
@@ -100,7 +100,6 @@ am_libicalss_la_OBJECTS = icalcalendar.l
 	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 =  \
@@ -307,7 +306,7 @@ INCLUDES = \
 	$(BDB_INCLUDE)
 
 libicalss_la_LDFLAGS = -version-info 32:0:32
-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 = \
@@ -350,6 +349,8 @@ COMBINEDHEADERS = \
 	$(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	\
diff -urNp libical-0.32.orig/src/test/Makefile.in libical-0.32/src/test/Makefile.in
--- libical-0.32.orig/src/test/Makefile.in	2008-09-02 00:06:17.000000000 +0530
+++ libical-0.32/src/test/Makefile.in	2008-09-02 21:30:44.140744843 +0530
@@ -78,10 +78,11 @@ recur_LDADD = $(LDADD)
 recur_DEPENDENCIES = ../libicalss/libicalss.la \
 	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
 	../libical/libical.la $(am__DEPENDENCIES_2)
+ at WITH_CXX_BINDINGS_TRUE@am__objects_1 = regression-cxx.$(OBJEXT)
 am_regression_OBJECTS = regression.$(OBJEXT) \
 	regression-component.$(OBJEXT) regression-classify.$(OBJEXT) \
 	regression-utils.$(OBJEXT) regression-recur.$(OBJEXT) \
-	regression-storage.$(OBJEXT)
+	regression-storage.$(OBJEXT) $(am__objects_1)
 regression_OBJECTS = $(am_regression_OBJECTS)
 regression_LDADD = $(LDADD)
 regression_DEPENDENCIES = ../libicalss/libicalss.la \
@@ -116,6 +117,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
 SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) \
 	$(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) \
 	$(testmime_SOURCES) $(testvcal_SOURCES)
@@ -270,13 +276,6 @@ target_vendor = @target_vendor@
 @WITH_CXX_BINDINGS_FALSE at cxx_libs = 
 @WITH_CXX_BINDINGS_TRUE at cxx_libs = ../libical/libical_cxx.la
 @WITH_CXX_BINDINGS_TRUE at regression_cxx_SOURCES = \
- at WITH_CXX_BINDINGS_TRUE@	regression.c		\
- at WITH_CXX_BINDINGS_TRUE@	regression.h		\
- at WITH_CXX_BINDINGS_TRUE@	regression-component.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-classify.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-utils.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-recur.c	\
- at WITH_CXX_BINDINGS_TRUE@	regression-storage.c	\
 @WITH_CXX_BINDINGS_TRUE@	regression-cxx.cpp
 
 @WITH_BDB4_FALSE at bdb4_inc = 
@@ -301,7 +300,8 @@ regression_SOURCES = \
 	regression-classify.c	\
 	regression-utils.c	\
 	regression-recur.c	\
-	regression-storage.c
+	regression-storage.c	\
+	$(regression_cxx_SOURCES)
 
 TESTS = regression
 copycluster_SOURCES = copycluster.c
@@ -321,7 +321,7 @@ CLEANFILES = \
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -395,6 +395,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-classify.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-component.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-cxx.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-recur.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-storage.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regression-utils.Po at am__quote@
@@ -424,6 +425,27 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jul 2008 18:16:10 -0000	1.4
+++ .cvsignore	2 Sep 2008 22:14:35 -0000	1.5
@@ -1 +1 @@
-libical-0.31.tar.gz
+libical-0.32.tar.gz


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-9/libical.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libical.spec	27 Jul 2008 15:06:34 -0000	1.8
+++ libical.spec	2 Sep 2008 22:14:35 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		libical
-Version:	0.31
-Release:	3%{?dist}
+Version:	0.32
+Release:	1%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -49,9 +49,7 @@
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-# PATCH0 breaks parallel build.
-# Parallel make does not work.
-make
+make %{?_smp_mflags}
 
 %check
 # make check
@@ -90,18 +88,32 @@
 %defattr(-,root,root,-)
 %doc doc/UsingLibical.txt
 %{_includedir}/ical.h
-%{_includedir}/ical*.h
-%{_includedir}/icptrholder.h
-%{_includedir}/pvl.h
-%{_includedir}/sspm.h
-%{_includedir}/vcomponent.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}_cxx.so
 %{_libdir}/libicalss.so
 %{_libdir}/libicalss_cxx.so
 %{_libdir}/libicalvcal.so
 
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/ical.h
+%{_includedir}/%{name}/ical*.h
+%{_includedir}/%{name}/icptrholder.h
+%{_includedir}/%{name}/pvl.h
+%{_includedir}/%{name}/sspm.h
+%{_includedir}/%{name}/vcomponent.h
+
+%dir %{_includedir}/libicalvcal
+%{_includedir}/libicalvcal/icalvcal.h
+%{_includedir}/libicalvcal/port.h
+%{_includedir}/libicalvcal/vcaltmp.h
+%{_includedir}/libicalvcal/vcc.h
+%{_includedir}/libicalvcal/vobject.h
+
 %changelog
+* Tue Sep 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.32-1
+- Version bump to 0.32.
+- Parallel build problems fixed.
+
 * Sun Jul 27 2008 Jeff Perry <jeffperry_fedora at sourcesink.com> - 0.31-3
 - Added 'BuildRequires: bison byacc flex'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jul 2008 18:16:10 -0000	1.4
+++ sources	2 Sep 2008 22:14:35 -0000	1.5
@@ -1 +1 @@
-39382c919abd9abfab6ecba27715eaa5  libical-0.31.tar.gz
+7e38be0c75769e62b7f76c5b6f373db9  libical-0.32.tar.gz


--- libical-0.31-makefile.patch DELETED ---