Date: Wednesday, October 22, 2014 @ 17:52:40 Author: jlichtblau Revision: 121225
upgpkg: osmo 0.2.12-2 Added: osmo/trunk/osmo.changelog Modified: osmo/trunk/PKGBUILD Deleted: osmo/trunk/ChangeLog osmo/trunk/osmo-0.2.10-configure.patch osmo/trunk/osmo-0.2.10-libnotify-0.7.patch ---------------------------------+ ChangeLog | 12 --------- PKGBUILD | 30 +++++++++-------------- osmo-0.2.10-configure.patch | 24 ------------------- osmo-0.2.10-libnotify-0.7.patch | 48 -------------------------------------- osmo.changelog | 15 +++++++++++ 5 files changed, 27 insertions(+), 102 deletions(-) Deleted: ChangeLog =================================================================== --- ChangeLog 2014-10-22 15:13:13 UTC (rev 121224) +++ ChangeLog 2014-10-22 15:52:40 UTC (rev 121225) @@ -1,12 +0,0 @@ -2010-04-04 Jaroslav Lichtblau <[email protected]> - * FS#18941 solved - -2010-04-02 Jaroslav Lichtblau <[email protected]> - * Update to major release 0.2.10 - -2009-03-26 Jaroslav Lichtblau <[email protected]> - * FS#13879 solved - -2009-03-17 Jaroslav Lichtblau <[email protected]> - * Updated to major version 0.2.6 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-10-22 15:13:13 UTC (rev 121224) +++ PKGBUILD 2014-10-22 15:52:40 UTC (rev 121225) @@ -5,34 +5,28 @@ pkgname=osmo pkgver=0.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="A handy personal organizer" -_svnver=937 arch=('i686' 'x86_64') url="http://clayo.org/osmo/"; license=('GPL') -depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts>=1.2.1' 'libxml2') -makedepends=('libtar') +depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts' 'libxml2') +makedepends=('libarchive') optdepends=('sox: to play sounds') -install=osmo.install -source=(ftp://ftp.archlinux.org/other/community/osmo/osmo-${_svnver}.tar.xz - osmo-0.2.10-configure.patch) -md5sums=('ddcd0b23a24d8f1ec5abc904742233bf' - '122fc15441b6215081772a00aa532394') +changelog=$pkgname.changelog +install=$pkgname.install +source=(http://sourceforge.net/projects/osmo-pim/files/osmo-pim/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('93bda51614f92e4193840451612e792219f7d8c90d78bdc7ea6d6c14a2be6b78') -prepare() { - cd osmo-pim - patch -Np1 -i ../osmo-0.2.10-configure.patch - autoreconf -fi -} +build() { + cd "${srcdir}"/$pkgname-$pkgver -build() { - cd osmo-pim ./configure --prefix=/usr make } package() { - cd osmo-pim - make DESTDIR="$pkgdir" install + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install } Deleted: osmo-0.2.10-configure.patch =================================================================== --- osmo-0.2.10-configure.patch 2014-10-22 15:13:13 UTC (rev 121224) +++ osmo-0.2.10-configure.patch 2014-10-22 15:52:40 UTC (rev 121225) @@ -1,24 +0,0 @@ ---- osmo-pim/configure.ac 2011-08-15 19:06:25.184165142 -0700 -+++ osmo-pim/configure.ac.new 2011-08-15 19:35:19.285312355 -0700 -@@ -4,7 +4,7 @@ - AC_PREREQ(2.61) - AC_INIT([Osmo], [0.2.12], [[email protected]]) - AC_CONFIG_MACRO_DIR([m4]) --AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AM_INIT_AUTOMAKE([-Werror foreign]) - AC_CONFIG_SRCDIR([src/contacts.c]) - AC_CONFIG_HEADER([config.h]) - AC_MSG_CHECKING(for type of build) -@@ -245,9 +245,9 @@ - [configdir=$withval AC_SUBST([configdir])]) - AM_CONDITIONAL([CONFIGDIR], [test x$configdir != x]) - --CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"} --CXXFLAGS=${CXXFLAGS:="$CFLAGS"} --CPPFLAGS="" -+CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS" -+CXXFLAGS="$CFLAGS $CXXFLAGS" -+CPPFLAGS="-D_GNU_SOURCE" - LIBS="$gringotts_LIBS" - - AC_CONFIG_FILES([ Deleted: osmo-0.2.10-libnotify-0.7.patch =================================================================== --- osmo-0.2.10-libnotify-0.7.patch 2014-10-22 15:13:13 UTC (rev 121224) +++ osmo-0.2.10-libnotify-0.7.patch 2014-10-22 15:52:40 UTC (rev 121225) @@ -1,48 +0,0 @@ -http://pkgs.fedoraproject.org/gitweb/?p=osmo.git;a=blob_plain;f=osmo-0.2.10-libnotify-0.7.0.patch;hb=HEAD - ---- src/check_events.c -+++ src/check_events.c -@@ -454,9 +454,9 @@ - a->date = 0; - - if (textdesc != NULL) -- a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL); -+ a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING); - else -- a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL); -+ a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING); - - g_free (textdesc); - g_free (text); -@@ -483,9 +483,6 @@ - #endif /* HAVE_LIBNOTIFY */ - - if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) { --#ifdef HAVE_LIBNOTIFY -- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon); --#endif /* HAVE_LIBNOTIFY */ - gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK); - - if (config.blink_on_events) { -@@ -532,9 +529,9 @@ - a->time = -1; - a->date = 0; - if (textdesc != NULL) -- a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL); -+ a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO); - else -- a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL); -+ a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO); - - notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER); - notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL); -@@ -545,9 +542,6 @@ - #endif /* HAVE_LIBNOTIFY */ - - if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) { --#ifdef HAVE_LIBNOTIFY -- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon); --#endif /* HAVE_LIBNOTIFY */ - gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK); - - if (config.blink_on_events) { Added: osmo.changelog =================================================================== --- osmo.changelog (rev 0) +++ osmo.changelog 2014-10-22 15:52:40 UTC (rev 121225) @@ -0,0 +1,15 @@ +2014-10-22 Jaroslav Lichtblau <[email protected]> + * osmo 0.2.12-2 upstream stable version + +2010-04-04 Jaroslav Lichtblau <[email protected]> + * FS#18941 solved + +2010-04-02 Jaroslav Lichtblau <[email protected]> + * Update to major release 0.2.10 + +2009-03-26 Jaroslav Lichtblau <[email protected]> + * FS#13879 solved + +2009-03-17 Jaroslav Lichtblau <[email protected]> + * Updated to major version 0.2.6 +
