From dcef4c5aa0fc25f63a540167899502fa8554dfc6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Sep 02 2008 22:10:31 +0000 Subject: - Version bump to 0.32. - Parallel build problems fixed. --- diff --git a/.cvsignore b/.cvsignore index 1a3f071..fe84aef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libical-0.31.tar.gz +libical-0.32.tar.gz diff --git a/libical-0.31-makefile.patch b/libical-0.31-makefile.patch deleted file mode 100644 index ce7d46a..0000000 --- a/libical-0.31-makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urNp libical-0.31.orig/src/libical/Makefile.in libical-0.31/src/libical/Makefile.in ---- libical-0.31.orig/src/libical/Makefile.in 2008-07-27 16:32:25.000000000 +0530 -+++ libical-0.31/src/libical/Makefile.in 2008-07-27 16:55:45.000000000 +0530 -@@ -105,7 +105,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.31.orig/src/libicalss/Makefile.in libical-0.31/src/libicalss/Makefile.in ---- libical-0.31.orig/src/libicalss/Makefile.in 2008-07-27 16:32:25.000000000 +0530 -+++ libical-0.31/src/libicalss/Makefile.in 2008-07-27 17:18:55.000000000 +0530 -@@ -103,7 +103,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@am_libicalss_cxx_la_OBJECTS = \ -@@ -352,6 +351,8 @@ COMBINEDHEADERS = \ - $(srcdir)/icalspanlist.h \ - $(srcdir)/icalmessage.h - -+libicalss_cxx_la_LIBADD = ./.libs/libicalss.la -+libicalss_cxx_la_DEPENDENCIES = ./.libs/libicalss.la - @WITH_CXX_BINDINGS_TRUE@libicalss_cxx_la_SOURCES = \ - @WITH_CXX_BINDINGS_TRUE@ $(libicalss_evolution_la_SOURCES) \ - @WITH_CXX_BINDINGS_TRUE@ icalspanlist_cxx.h \ diff --git a/libical-0.32-makefile.patch b/libical-0.32-makefile.patch new file mode 100644 index 0000000..a04205f --- /dev/null +++ b/libical-0.32-makefile.patch @@ -0,0 +1,138 @@ +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@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@libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c + @DEV_TRUE@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@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) ++@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@cxx_libs = + @WITH_CXX_BINDINGS_TRUE@cxx_libs = ../libical/libical_cxx.la + @WITH_CXX_BINDINGS_TRUE@regression_cxx_SOURCES = \ +-@WITH_CXX_BINDINGS_TRUE@ regression.c \ +-@WITH_CXX_BINDINGS_TRUE@ regression.h \ +-@WITH_CXX_BINDINGS_TRUE@ regression-component.c \ +-@WITH_CXX_BINDINGS_TRUE@ regression-classify.c \ +-@WITH_CXX_BINDINGS_TRUE@ regression-utils.c \ +-@WITH_CXX_BINDINGS_TRUE@ regression-recur.c \ +-@WITH_CXX_BINDINGS_TRUE@ regression-storage.c \ + @WITH_CXX_BINDINGS_TRUE@ regression-cxx.cpp + + @WITH_BDB4_FALSE@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@./$(DEPDIR)/recur.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-classify.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-component.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-cxx.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-recur.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-storage.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-utils.Po@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: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++ ++.cpp.obj: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cpp.lo: ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< ++ + mostlyclean-libtool: + -rm -f *.lo + diff --git a/libical.spec b/libical.spec index aca07dd..cd8a61c 100644 --- a/libical.spec +++ b/libical.spec @@ -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 @@ korzystających z libical. # 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 @@ rm -rf $RPM_BUILD_ROOT %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 - 0.32-1 +- Version bump to 0.32. +- Parallel build problems fixed. + * Sun Jul 27 2008 Jeff Perry - 0.31-3 - Added 'BuildRequires: bison byacc flex'. diff --git a/sources b/sources index af91024..f3207e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39382c919abd9abfab6ecba27715eaa5 libical-0.31.tar.gz +7e38be0c75769e62b7f76c5b6f373db9 libical-0.32.tar.gz