From: helge Date: Sun, 17 Oct 2004 16:27:53 +0000 (+0000) Subject: activated versitSaxDriver as the primary iCal driver X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f7324b1eb7cd78ebe438099e3fbc8a70c9df9e;p=sope activated versitSaxDriver as the primary iCal driver git-svn-id: http://svn.opengroupware.org/SOPE/trunk@270 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/GNUmakefile b/GNUmakefile index c6ec2f18..4861531f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -15,3 +15,6 @@ SUBPROJECTS += \ -include $(GNUSTEP_MAKEFILES)/GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/aggregate.make -include $(GNUSTEP_MAKEFILES)/GNUmakefile.postamble + +distclean :: + if test -f config.make; then rm config.make; fi diff --git a/maintenance/ChangeLog b/maintenance/ChangeLog new file mode 100644 index 00000000..2057df1e --- /dev/null +++ b/maintenance/ChangeLog @@ -0,0 +1,10 @@ +2004-10-17 Helge Hess + + * mod_ngobjweb*.spec: fixed URL (pointed to libical) + + * sope.spec: package versitSaxDriver instead of iCalSaxDriver + + * *.spec: removed executable property from specfiles + + * created ChangeLog + diff --git a/maintenance/mod_ngobjweb_fedora.spec b/maintenance/mod_ngobjweb_fedora.spec old mode 100755 new mode 100644 index bcf083af..14207bd9 --- a/maintenance/mod_ngobjweb_fedora.spec +++ b/maintenance/mod_ngobjweb_fedora.spec @@ -5,7 +5,7 @@ Release: %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix} Vendor: OpenGroupware.org Packager: Frank Reppin License: LGPL -URL: http://www.softwarestudio.org/libical +URL: http://sope.opengroupware.org/ Group: Development/Libraries AutoReqProv: off Requires: ogo-environment diff --git a/maintenance/mod_ngobjweb_mdk100.spec b/maintenance/mod_ngobjweb_mdk100.spec old mode 100755 new mode 100644 index 9293ae27..30aa72c0 --- a/maintenance/mod_ngobjweb_mdk100.spec +++ b/maintenance/mod_ngobjweb_mdk100.spec @@ -5,7 +5,7 @@ Release: %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix} Vendor: OpenGroupware.org Packager: Frank Reppin License: LGPL -URL: http://www.softwarestudio.org/libical +URL: http://sope.opengroupware.org/ Group: Development/Libraries AutoReqProv: off Requires: ogo-environment diff --git a/maintenance/mod_ngobjweb_mdk101.spec b/maintenance/mod_ngobjweb_mdk101.spec old mode 100755 new mode 100644 index 9293ae27..30aa72c0 --- a/maintenance/mod_ngobjweb_mdk101.spec +++ b/maintenance/mod_ngobjweb_mdk101.spec @@ -5,7 +5,7 @@ Release: %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix} Vendor: OpenGroupware.org Packager: Frank Reppin License: LGPL -URL: http://www.softwarestudio.org/libical +URL: http://sope.opengroupware.org/ Group: Development/Libraries AutoReqProv: off Requires: ogo-environment diff --git a/maintenance/mod_ngobjweb_slss8.spec b/maintenance/mod_ngobjweb_slss8.spec old mode 100755 new mode 100644 index d68144f5..0b963f3b --- a/maintenance/mod_ngobjweb_slss8.spec +++ b/maintenance/mod_ngobjweb_slss8.spec @@ -5,7 +5,7 @@ Release: %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix} Vendor: OpenGroupware.org Packager: Frank Reppin License: LGPL -URL: http://www.softwarestudio.org/libical +URL: http://sope.opengroupware.org/ Group: Development/Libraries AutoReqProv: off Requires: ogo-environment diff --git a/maintenance/mod_ngobjweb_suse82.spec b/maintenance/mod_ngobjweb_suse82.spec old mode 100755 new mode 100644 index 1c59ad20..4450d3f3 --- a/maintenance/mod_ngobjweb_suse82.spec +++ b/maintenance/mod_ngobjweb_suse82.spec @@ -5,7 +5,7 @@ Release: %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix} Vendor: OpenGroupware.org Packager: Frank Reppin License: LGPL -URL: http://www.softwarestudio.org/libical +URL: http://sope.opengroupware.org/ Group: Development/Libraries AutoReqProv: off Requires: ogo-environment diff --git a/maintenance/mod_ngobjweb_suse91.spec b/maintenance/mod_ngobjweb_suse91.spec old mode 100755 new mode 100644 index 1c59ad20..4450d3f3 --- a/maintenance/mod_ngobjweb_suse91.spec +++ b/maintenance/mod_ngobjweb_suse91.spec @@ -5,7 +5,7 @@ Release: %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix} Vendor: OpenGroupware.org Packager: Frank Reppin License: LGPL -URL: http://www.softwarestudio.org/libical +URL: http://sope.opengroupware.org/ Group: Development/Libraries AutoReqProv: off Requires: ogo-environment diff --git a/maintenance/sope.spec b/maintenance/sope.spec old mode 100755 new mode 100644 index 732eb439..2a5845ed --- a/maintenance/sope.spec +++ b/maintenance/sope.spec @@ -322,7 +322,7 @@ rm -f ${RPM_BUILD_ROOT}%{prefix}/bin/testqp %defattr(-,root,root,-) %{prefix}/lib/libNGiCal*.so.4.3* %{prefix}/share/sope-4.3/saxmappings/NGiCal.xmap -%{prefix}/lib/sope-4.3/saxdrivers/iCalSaxDriver.sax +%{prefix}/lib/sope-4.3/saxdrivers/versitSaxDriver.sax %files ical-devel %defattr(-,root,root,-) diff --git a/sope-ical/ChangeLog b/sope-ical/ChangeLog new file mode 100644 index 00000000..aaa62a40 --- /dev/null +++ b/sope-ical/ChangeLog @@ -0,0 +1,8 @@ +2004-10-17 Helge Hess + + * all sope-ical makefiles now include config.make if available + + * GNUmakefile (SUBPROJECTS): compile versitSaxDriver and only compile + the ical sax driver if "libical=yes" is specified in the make call + + * create sope-ical ChangeLog diff --git a/sope-ical/GNUmakefile b/sope-ical/GNUmakefile index 20989aaa..724d3afd 100644 --- a/sope-ical/GNUmakefile +++ b/sope-ical/GNUmakefile @@ -1,10 +1,17 @@ +# GNUstep makefile + +-include ../config.make include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=sope-ical VERSION=4.3.0 -SUBPROJECTS = \ - iCalSaxDriver \ +SUBPROJECTS += \ + versitSaxDriver \ NGiCal +ifeq ($(libical),yes) +SUBPROJECTS += iCalSaxDriver +endif + include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/sope-ical/NGiCal/GNUmakefile b/sope-ical/NGiCal/GNUmakefile index 63458c49..ea872bbb 100644 --- a/sope-ical/NGiCal/GNUmakefile +++ b/sope-ical/NGiCal/GNUmakefile @@ -1,5 +1,6 @@ -# $Id: GNUmakefile 32 2004-08-21 00:50:30Z helge $ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make include ./Version diff --git a/sope-ical/README b/sope-ical/README new file mode 100644 index 00000000..5d1f2ea8 --- /dev/null +++ b/sope-ical/README @@ -0,0 +1,12 @@ +sope-ical +========= +Last change: 2004-10-17 + +This package currently contains three things: + +a) iCalSaxDriver - a SaxObjC SAX driver based on libical +b) versitSaxDriver - a SaxObjC SAX driver for parsing vCard and iCal files +c) NGiCal - a set of classes representing iCal entities + +The iCalSaxDriver is deprecated in favor of the versitSaxDriver which does +not have the dependency on libical but implements the parsing on its own. diff --git a/sope-ical/README-OSX.txt b/sope-ical/README-OSX.txt index 3bb39980..54530f04 100644 --- a/sope-ical/README-OSX.txt +++ b/sope-ical/README-OSX.txt @@ -1,5 +1,3 @@ -# $Id: README-OSX.txt 4 2004-08-20 17:04:31Z helge $ - Building Notes ============== diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile index bbd92cda..526a9163 100644 --- a/sope-ical/iCalSaxDriver/GNUmakefile +++ b/sope-ical/iCalSaxDriver/GNUmakefile @@ -1,5 +1,6 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make -include ../../Version -include ./Version diff --git a/sope-ical/versitSaxDriver/ChangeLog b/sope-ical/versitSaxDriver/ChangeLog index 8b1b0910..712f8363 100644 --- a/sope-ical/versitSaxDriver/ChangeLog +++ b/sope-ical/versitSaxDriver/ChangeLog @@ -1,3 +1,7 @@ +2004-10-17 Helge Hess + + * added fhs.make, some other minor fixes to makefiles (v1.0.6) + 2004-10-16 Marcus Mueller * v1.0.5 diff --git a/sope-ical/versitSaxDriver/GNUmakefile b/sope-ical/versitSaxDriver/GNUmakefile index 262f220a..ece2964c 100644 --- a/sope-ical/versitSaxDriver/GNUmakefile +++ b/sope-ical/versitSaxDriver/GNUmakefile @@ -1,10 +1,13 @@ -# $Id$ +# GNUstep makefile +-include ../../config.make include $(GNUSTEP_MAKEFILES)/common.make +-include ../../Version +-include ./Version BUNDLE_NAME = versitSaxDriver BUNDLE_EXTENSION = .sax -BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-4.3 +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/ versitSaxDriver_OBJC_FILES = \ VSSaxDriver.m \ @@ -17,3 +20,4 @@ versitSaxDriver_RESOURCE_FILES = bundle-info.plist -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble +-include fhs.make diff --git a/sope-ical/versitSaxDriver/GNUmakefile.preamble b/sope-ical/versitSaxDriver/GNUmakefile.preamble index af27dfa7..d773696f 100644 --- a/sope-ical/versitSaxDriver/GNUmakefile.preamble +++ b/sope-ical/versitSaxDriver/GNUmakefile.preamble @@ -1,4 +1,4 @@ -# $Id$ +# compilation settings SOPE_ROOT=../.. SOPE_OBJ_ROOT=$(GNUSTEP_BUILD_DIR)/$(SOPE_ROOT) diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version index 5af8f0ce..90e065dc 100644 --- a/sope-ical/versitSaxDriver/Version +++ b/sope-ical/versitSaxDriver/Version @@ -1,5 +1,5 @@ -# $Id$ +# Version file MAJOR_VERSION=1 MINOR_VERSION=0 -SUBMINOR_VERSION:=5 +SUBMINOR_VERSION:=6 diff --git a/sope-ical/versitSaxDriver/fhs.make b/sope-ical/versitSaxDriver/fhs.make new file mode 100644 index 00000000..56604151 --- /dev/null +++ b/sope-ical/versitSaxDriver/fhs.make @@ -0,0 +1,25 @@ +# postprocessing + +# FHS support (this is a hack and is going to be done by gstep-make!) + +ifneq ($(FHS_INSTALL_ROOT),) + +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +FHS_SAX_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxdrivers/ + +fhs-sax-dirs :: + $(MKDIRS) $(FHS_SAX_DIR) + +move-bundles-to-fhs :: fhs-sax-dirs + @echo "moving bundles $(BUNDLE_INSTALL_DIR) to $(FHS_SAX_DIR) .." + for i in $(BUNDLE_NAME); do \ + j="$(FHS_SAX_DIR)/$${i}$(BUNDLE_EXTENSION)"; \ + if test -d $$j; then rm -r $$j; fi; \ + mv "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)" $$j; \ + done + +move-to-fhs :: move-bundles-to-fhs + +after-install :: move-to-fhs + +endif