commit 293e12bf77c0baf8c3da390579386f0f3e0f5059
Author: Krzysztof Mrozowicz <[email protected]>
Date: Tue Mar 15 12:12:30 2022 +0000
- up to 0.4.4
ac.patch | 11 ----------
osmo-datadir.patch | 23 ++++++++++----------
osmo-libnotify.patch | 60 ----------------------------------------------------
osmo.spec | 54 +++++++++++++++++++++++++++++++---------------
4 files changed, 49 insertions(+), 99 deletions(-)
---
diff --git a/osmo.spec b/osmo.spec
index aa60de7..68da4b5 100644
--- a/osmo.spec
+++ b/osmo.spec
@@ -1,28 +1,27 @@
#
# Conditional builds:
-%bcond_with libsyncml # enable experimental SyncML plugin
#
Summary: Simple PIM application
Summary(pl.UTF-8): Prosta aplikacja PIM (do zarządzania informacjami
osobistymi)
Name: osmo
-Version: 0.2.10
-Release: 5
+Version: 0.4.4
+Release: 1
License: GPL v2+
Group: X11/Applications
Source0:
http://downloads.sourceforge.net/osmo-pim/%{name}-%{version}.tar.gz
-# Source0-md5: a774db748228efee96186158d553ade9
+# Source0-md5: 4a22d229c57c12899520edecd73e6bb9
Patch0: %{name}-datadir.patch
-Patch1: %{name}-libnotify.patch
-Patch2: ac.patch
URL: http://clayo.org/osmo/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-tools
-BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: gspell-devel >= 1.2.0
+BuildRequires: gtk+3-devel >= 3.10.0
+BuildRequires: gtk-webkit4-devel >= 2.8.0
+BuildRequires: libarchive-devel >= 3.0.0
BuildRequires: libgringotts-devel >= 1.2.1
BuildRequires: libical-devel >= 0.27
-BuildRequires: libnotify-devel >= 0.4.4
-%{?with_libsyncml:BuildRequires: libsyncml-devel >= 0.4.0}
+BuildRequires: libnotify-devel >= 0.7.0
BuildRequires: libxml2-devel >= 2.0
BuildRequires: pkgconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,9 +32,9 @@ manager and address book modules. It was designed to be a
small, easy
to use and good looking PIM tool to help to manage personal
information. In current state the organizer is quite convenient in use
- for example, user can perform nearly all operations using keyboard.
-Also, a lot of parameters are configurable to meet user preferences.
-On the technical side, Osmo is GTK+ based tool which use plain XML
-database to store all personal data.
+ Also, a lot of parameters are configurable to meet user preferences.
+ On the technical side, Osmo is GTK+ based tool which use plain XML
+ database to store all personal data.
%description -l pl.UTF-8
Osmo to podręczny osobisty organizer, zawierający moduły kalendarza,
@@ -51,16 +50,13 @@ przechowywania danych bazę danych w czystym XML-u.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure \
- --with%{!?with_libsyncml:out}-libsyncml
+%configure
%{__make}
%install
@@ -69,17 +65,41 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# unsupported locale
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{gl_ES,ur_PK}
+
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%banner %{name} -e << EOF
+
+Since version 0.4.0 Osmo uses XDG Base Directory Specification
+(http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html)
+for storing configuration and data files.
+
+The files are stored in locations indicated by XDG_CONFIG_HOME and
+XDG_DATA_HOME environmental variables. Typically, these variables are set
+to \$HOME/.config/osmo and \$HOME/.local/share/osmo directories.
+
+In order to run Osmo with other setup, these variables have to be
+adjusted - e.g. (for BASH shell):
+
+export XDG_CONFIG_HOME="path/to/osmo/config"
+export XDG_DATA_HOME="path/to/osmo/data"
+
+EOF
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README TRANSLATORS
%attr(755,root,root) %{_bindir}/osmo
%{_datadir}/%{name}
-%{_pixmapsdir}/osmo.png
+%{_pixmapsdir}/osmo*.png
+%{_pixmapsdir}/moonphase_*.png
%{_desktopdir}/osmo.desktop
+%{_iconsdir}/hicolor/*/actions/osmo*
%{_iconsdir}/hicolor/*/apps/osmo.*
%{_mandir}/man1/osmo.1*
diff --git a/ac.patch b/ac.patch
deleted file mode 100644
index 0778960..0000000
--- a/ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- osmo-0.2.10/configure.ac~ 2010-03-31 23:47:35.000000000 +0200
-+++ osmo-0.2.10/configure.ac 2015-05-24 14:46:11.656197790 +0200
-@@ -4,7 +4,7 @@
- AC_PREREQ(2.61)
- AC_INIT([Osmo], [0.2.10], [[email protected]])
- AC_CONFIG_MACRO_DIR([m4])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([src/contacts.c])
- AC_CONFIG_HEADER([config.h])
- AC_MSG_CHECKING(for type of build)
diff --git a/osmo-datadir.patch b/osmo-datadir.patch
index 97d81eb..0a84e34 100644
--- a/osmo-datadir.patch
+++ b/osmo-datadir.patch
@@ -1,5 +1,5 @@
---- osmo-0.2.10/data/sounds/Makefile.am~ 2010-03-31 23:47:35.000000000
+0200
-+++ osmo-0.2.10/data/sounds/Makefile.am 2010-04-07 15:09:54.210260533
+0200
+--- osmo-0.4.4/data/sounds/Makefile.am~ 2017-03-28 20:27:38.000000000
+0000
++++ osmo-0.4.4/data/sounds/Makefile.am 2022-03-15 11:58:00.466956111 +0000
@@ -1,5 +1,5 @@
-soundsdir = $(datadir)/sounds/osmo
@@ -7,13 +7,14 @@
sounds_DATA = alarm.wav
EXTRA_DIST = $(sounds_DATA)
---- osmo-0.2.10/src/Makefile.am~ 2010-03-31 23:47:34.000000000 +0200
-+++ osmo-0.2.10/src/Makefile.am 2010-04-07 15:11:56.310262574 +0200
-@@ -1,6 +1,6 @@
- REVISION := $(shell if test -e .svn; then echo -DREV=\"`LC_ALL=C svn info |
sed -n '/^Rev/p'| sed -e 's/^Revision:\ //'`\"; fi;)
- AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" $(REVISION)
-DDATADIR=\"$(datadir)\" \
-- -DSOUNDSDIR=\"$(datadir)/sounds\" \
-+ -DSOUNDSDIR=\"$(datadir)/osmo/sounds\" \
- @GTK_CFLAGS@ @XML_CPPFLAGS@ -Wall
- dnl -DGDK_PIXBUF_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS
+--- osmo-0.4.4/src/Makefile.am~ 2020-07-12 08:13:46.000000000 +0000
++++ osmo-0.4.4/src/Makefile.am 2022-03-15 11:56:50.101668152 +0000
+@@ -6,7 +6,7 @@
+ VERSION_MICRO := $(shell echo $(VERSION) | awk -F "." '{print $$3}')
+ AM_CPPFLAGS = -DREPO=$(ISREPO) -DREVISION=$(REVISION)
-DLOCALEDIR=\"$(datadir)/locale\" -DDATADIR=\"$(datadir)\" \
+ -DVERSION_MAJOR=\"$(VERSION_MAJOR)\"
-DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_MICRO=\"$(VERSION_MICRO)\" \
+- -DSOUNDSDIR=\"$(datadir)/sounds\" @GTK_CFLAGS@
@XML_CPPFLAGS@ -Wall -DGDK_DISABLE_DEPRECATION_WARNINGS \
++ -DSOUNDSDIR=\"$(datadir)/osmo/sounds\" @GTK_CFLAGS@
@XML_CPPFLAGS@ -Wall -DGDK_DISABLE_DEPRECATION_WARNINGS \
+ -DICONSDIR=\"$(datadir)/icons\"
-DPIXMAPSDIR=\"$(datadir)/pixmaps\" \
+ -DG_DISABLE_CAST_CHECKS
diff --git a/osmo-libnotify.patch b/osmo-libnotify.patch
deleted file mode 100644
index be5bd84..0000000
--- a/osmo-libnotify.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- osmo-0.2.10/src/check_events.c.libnotify 2011-04-13 20:45:53.205331690
+0200
-+++ osmo-0.2.10/src/check_events.c 2011-04-13 21:12:39.586781174 +0200
-@@ -453,11 +453,17 @@ gboolean sound_flag = TRUE;
- a->time = -1;
- a->date = 0;
-
-+#if NOTIFY_CHECK_VERSION(0, 7, 0)
- if (textdesc != 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);
-+#else
-+ if (textdesc != NULL)
- a->notify =
notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING,
NULL);
- else
- a->notify =
notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
--
-+#endif
- g_free (textdesc);
- g_free (text);
-
-@@ -484,7 +490,9 @@ gboolean sound_flag = TRUE;
-
- if (gtk_status_icon_get_visible
(appGUI->osmo_trayicon)) {
- #ifdef HAVE_LIBNOTIFY
-+#if !NOTIFY_CHECK_VERSION(0, 7, 0)
-
notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
-+#endif
- #endif /* HAVE_LIBNOTIFY */
- gtk_status_icon_set_from_stock
(appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
-
-@@ -531,11 +539,17 @@ gboolean sound_flag = TRUE;
- a->type = NOTIFY_WARNING;
- a->time = -1;
- a->date = 0;
-+#if NOTIFY_CHECK_VERSION(0, 7, 0)
-+ if (textdesc != 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);
-+#else
- if (textdesc != NULL)
- a->notify =
notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO,
NULL);
- else
- a->notify =
notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO,
NULL);
--
-+#endif
- notify_notification_set_timeout
(a->notify, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency
(a->notify, NOTIFY_URGENCY_NORMAL);
- if (tsk_get_category_state
(item->category, STATE_TASKS, appGUI) == TRUE)
-@@ -546,7 +560,9 @@ gboolean sound_flag = TRUE;
-
- if (gtk_status_icon_get_visible
(appGUI->osmo_trayicon)) {
- #ifdef HAVE_LIBNOTIFY
-+#if !NOTIFY_CHECK_VERSION(0, 7, 0)
-
notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
-+#endif
- #endif /* HAVE_LIBNOTIFY */
- gtk_status_icon_set_from_stock
(appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/osmo.git/commitdiff/b14660b6bc653bdfd961900c718e580b55d4b4cd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
