osmo: => 0.2.14

7 files changed, 47 insertions, 38 deletions

diff --git a/gnome2-apps/osmo/BUILD b/gnome2-apps/osmo/BUILD
index b78f9953a7..9d101f6466 100755
--- a/gnome2-apps/osmo/BUILD
+++ b/gnome2-apps/osmo/BUILD
@@ -1,3 +1,3 @@
-OPTS="$OPTS $OSMO_CONTACTS $OSMO_TASKS $OSMO_NOTES" &&
-CFLAGS="$CFLAGS -I$INSTALL_ROOT/usr/include/libical" &&
+OPTS="$OSMO_OPTS $OPTS" &&
+
 default_build
diff --git a/gnome2-apps/osmo/CONFIGURE b/gnome2-apps/osmo/CONFIGURE
index e2f52f7286..356757e7f7 100755
--- a/gnome2-apps/osmo/CONFIGURE
+++ b/gnome2-apps/osmo/CONFIGURE
@@ -1,8 +1,23 @@
-config_query_option OSMO_CONTACTS  "Enable Contacts module" y  \
-                    "--with-contacts" "--without-contacts"     &&
+config_query_option OSMO_OPTS "Enable printing support" y \
+                              "--enable-printing" \
+                              "--disable-printing" &&
 
-config_query_option OSMO_TASKS  "Enable Tasks module" y        \
-                    "--with-tasks" "--without-tasks"           &&
+# backporting legacy options
+for o in OSMO_CONTACTS OSMO_TASKS OSMO_NOTES; do
+  if [[ -n ${!o} ]]; then
+    list_add "OSMO_OPTS" "${!o}"
+    persistent_remove ${o}
+  fi
+done &&
 
-config_query_option OSMO_NOTES  "Enable Notes module" y        \
-                    "--with-notes" "--without-notes"
+config_query_option OSMO_OPTS "Enable Contacts module" y \
+                              "--with-contacts" \
+                              "--without-contacts" &&
+
+config_query_option OSMO_OPTS "Enable Tasks module" y \
+                              "--with-tasks" \
+                              "--without-tasks" &&
+
+config_query_option OSMO_OPTS "Enable Notes module" y \
+                              "--with-notes" \
+                              "--without-notes"
diff --git a/gnome2-apps/osmo/DEPENDS b/gnome2-apps/osmo/DEPENDS
index 4aa5e6e69a..b52e25806b 100755
--- a/gnome2-apps/osmo/DEPENDS
+++ b/gnome2-apps/osmo/DEPENDS
@@ -1,32 +1,20 @@
-depends  gtk+2    &&
-depends  libxml2  &&
+depends gtk+2 &&
+depends libxml2 &&
+depends gettext &&
 
-optional_depends  gtkspell                                \
-                  ""                                      \
-                  ""                                      \
-                  "for gtkspell support"                  &&
+optional_depends libgringotts \
+                 "--enable-backup" \
+                 "--disable-backup" \
+                 "for backup support" &&
 
-optional_depends  libical                                 \
-                  ""                                      \
-                  ""                                      \
-                  "for libical support"                   &&
+if is_depends_enabled $SPELL libgringotts; then
+  depends libarchive
+fi &&
 
-optional_depends  libnotify                               \
-                  ""                                      \
-                  ""                                      \
-                  "for libnotify support"                 &&
+optional_depends libical "" "" "for iCalendar support" &&
+optional_depends gtkspell "" "" "for spell-checking support" &&
+optional_depends webkitgtk "" "" "for HTML rendering support" &&
 
-optional_depends  libtar                                  \
-                  ""                                      \
-                  ""                                      \
-                  "for libtar support"                    &&
-
-optional_depends  libgringotts                            \
-                  ""                                      \
-                  ""                                      \
-                  "for libgringotts support"              &&
-
-optional_depends  libsyncml                               \
-                  "--with-libsyncml"                      \
-                  "--without-libsyncml"                   \
-                  "to enable experimental SyncML plugin"
+if list_find "$OSMO_OPTS" "--with-tasks"; then
+  optional_depends libnotify "" "" "for task notification support"
+fi
diff --git a/gnome2-apps/osmo/DETAILS b/gnome2-apps/osmo/DETAILS
index 9fe73400c4..c7697f5dfd 100755
--- a/gnome2-apps/osmo/DETAILS
+++ b/gnome2-apps/osmo/DETAILS
@@ -1,8 +1,8 @@
            SPELL=osmo
-         VERSION=0.2.8
+         VERSION=0.2.14
           SOURCE=$SPELL-$VERSION.tar.gz
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/osmo-pim/$SOURCE
         WEB_SITE=http://clayo.org/osmo/
       LICENSE[0]=GPL
diff --git a/gnome2-apps/osmo/HISTORY b/gnome2-apps/osmo/HISTORY
index a7c69fe55b..fb3f32fc3d 100644
--- a/gnome2-apps/osmo/HISTORY
+++ b/gnome2-apps/osmo/HISTORY
@@ -1,3 +1,9 @@
+2015-10-10 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.2.14; quoting paths
+	* CONFIGURE: added printing flags; switch to OSMO_OPTS
+	* BUILD: use OSMO_OPTS; removed a crutch for libical
+	* DEPENDS: rewritten
+
 2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/gnome2-apps/osmo/osmo-0.2.14.tar.gz.sig b/gnome2-apps/osmo/osmo-0.2.14.tar.gz.sig
new file mode 100644
index 0000000000..bdccfac8d6
--- /dev/null
+++ b/gnome2-apps/osmo/osmo-0.2.14.tar.gz.sig
diff --git a/gnome2-apps/osmo/osmo-0.2.8.tar.gz.sig b/gnome2-apps/osmo/osmo-0.2.8.tar.gz.sig
deleted file mode 100644
index 22a0bd29b2..0000000000
--- a/gnome2-apps/osmo/osmo-0.2.8.tar.gz.sig
+++ /dev/null