From b7efa6c2abba888e30a957d885c8a866b92946a2 Mon Sep 17 00:00:00 2001 From: aarem Date: Jan 30 2017 02:12:06 +0000 Subject: import of 0.2.14-9 --- diff --git a/osmo-0.2.10-aplay.patch b/osmo-0.2.10-aplay.patch deleted file mode 100644 index 31ab808..0000000 --- a/osmo-0.2.10-aplay.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- osmo-0.2.10.orig/src/options_prefs.c 2010-03-31 23:47:34.000000000 +0200 -+++ osmo-0.2.10/src/options_prefs.c 2010-10-27 00:22:48.252574820 +0200 -@@ -120,7 +120,7 @@ - g_strlcpy (config.spell_lang, g_getenv("LANG"), MAXNAME); - g_strlcpy (config.web_browser, "xdg-open %s", MAXHELPERCMD); - g_strlcpy (config.email_client, "xdg-email %s", MAXHELPERCMD); -- g_strlcpy (config.sound_player, "play %s", MAXHELPERCMD); -+ g_strlcpy (config.sound_player, "aplay %s", MAXHELPERCMD); - - /* calendar */ - config.fy_window_size_x = 750; diff --git a/osmo-0.2.10-configure.patch b/osmo-0.2.10-configure.patch deleted file mode 100644 index 803823b..0000000 --- a/osmo-0.2.10-configure.patch +++ /dev/null @@ -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], [pasp@users.sf.net]) - 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="$tar_LIBS $gringotts_LIBS" - - AC_CONFIG_FILES([ diff --git a/osmo-0.2.10-fix-version-string.patch b/osmo-0.2.10-fix-version-string.patch deleted file mode 100644 index 2ae0726..0000000 --- a/osmo-0.2.10-fix-version-string.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- osmo-0.2.10.orig/src/gui.h 2010-03-31 23:47:34.000000000 +0200 -+++ osmo-0.2.10/src/gui.h 2010-11-06 14:09:13.526493839 +0100 -@@ -62,7 +62,7 @@ - - #define VERSION_MAJOR 0 - #define VERSION_MINOR 2 --#define VERSION_MICRO 8 -+#define VERSION_MICRO 10 - - #define MAX_MONTHS 12 - #define MAX_WEEKS 6 diff --git a/osmo.spec b/osmo.spec index 3feb2f3..71d3d61 100644 --- a/osmo.spec +++ b/osmo.spec @@ -1,7 +1,7 @@ # 'rel' is always the release number. # If you're building from SVN, set 'svn' to the SVN revision. If not, set it to 0. -%global rel 8 -%global svn 924 +%global rel 9 +%global svn 0 %if %{svn} # svn co https://osmo-pim.svn.sourceforge.net/svnroot/osmo-pim/trunk osmo-pim # tar cvJf osmo-%{svn}.tar.xz osmo-pim/ --exclude=".svn*" @@ -18,16 +18,16 @@ Summary: Personal organizer Summary(pl): Osobisty organizer Summary(de): Persönlicher Organizer Name: osmo -Version: 0.2.12 +Version: 0.2.14 Release: %{release} License: GPLv2+ Group: Applications/Productivity URL: http://clayo.org/osmo/ Source0: http://downloads.sourceforge.net/%{name}-pim/%{tarname} -Patch0: %{name}-0.2.10-configure.patch +#Patch0: %{name}-0.2.10-configure.patch # Distro specific patches -Patch10: %{name}-0.2.10-aplay.patch +#Patch10: %{name}-0.2.10-aplay.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -36,10 +36,10 @@ BuildRequires: gettext BuildRequires: gtk2-devel BuildRequires: gtkspell-devel BuildRequires: libical-devel -BuildRequires: libnotify-devel +#BuildRequires: libnotify-devel BuildRequires: libxml2-devel # for contacts -BuildRequires: webkitgtk-devel +# BuildRequires: webkitgtk-devel # for backup BuildRequires: libgringotts-devel BuildRequires: libtar-devel @@ -81,8 +81,8 @@ viele Parameter einstellen, um die Vorlieben des Benutzers zu treffen. %prep %setup -q -n %{_dirname} -%patch0 -p1 -b .configure -%patch10 -p1 -b .aplay +#%patch0 -p1 -b .configure +#%patch10 -p1 -b .aplay autoreconf -vif @@ -136,7 +136,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README README.syncml TRANSLATORS +%doc AUTHORS ChangeLog COPYING README TRANSLATORS %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png @@ -146,6 +146,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/sounds/osmo/alarm.wav %changelog +* Sun Jan 29 2017 Ranjan Maitra - 0.2.14-0.9 +- updated version to 0.2.14 +- dropped Patch0 and Patch10 - configures without Patch10 +- dropped aplay patch -- will see if it matters +- dropped dependence on webgitk-devel +- dropped readme.syncml in FILES +- dropped libnotify-devel in BuildRequires +- switched from svn to stable version + * Fri Apr 15 2016 David Tardon - 0.2.12-0.8.svn924.4 - rebuild for ICU 57.1