Hello community, here is the log from the commit of package orage for openSUSE:Factory checked in at 2013-02-01 15:56:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orage (Old) and /work/SRC/openSUSE:Factory/.orage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orage", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/orage/orage.changes 2012-05-08 06:47:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.orage.new/orage.changes 2013-02-01 15:56:11.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Feb 1 10:59:27 UTC 2013 - [email protected] + +- update to version 4.8.4: + - fix bxo#8525: Orage notifies every second on "All day events" + - fix bxo#4817: anchor('#') does not work in help links + - fix bxo#9243: strptime() needs _XOPEN_SOURCE_EXTENDED defined + - fix bxo#9248: internal libical fix SSPM_UNKNOWN_MINOR_TYPE + - fix bxo#8231: alarm type is selectable for foreign files + - fix bxo#9739: new TODOs start as NOT completed + - fix bxo#9738: main window sorts TODOs by due-date + - fix bxo#9598: main window tooltip shows title and location bold + - translation updates +- rebase and rename orage-4.8.2-use-docdir.patch to + orage-use-docdir.patch +- add orage-do-not-hardcode-firefox.patch in order to use exo-open + instead of hardcoding firefox + +------------------------------------------------------------------- Old: ---- orage-4.8.2-use-docdir.patch orage-4.8.3.tar.bz2 New: ---- orage-4.8.4.tar.bz2 orage-do-not-hardcode-firefox.patch orage-use-docdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orage.spec ++++++ --- /var/tmp/diff_new_pack.BLaLjx/_old 2013-02-01 15:56:13.000000000 +0100 +++ /var/tmp/diff_new_pack.BLaLjx/_new 2013-02-01 15:56:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package orage # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: orage -Version: 4.8.3 +Version: 4.8.4 Release: 0 Summary: Time-managing Application for the Xfce Desktop Environment License: GPL-2.0+ @@ -25,8 +25,10 @@ Url: http://www.xfce.org/projects#applications Source: http://archive.xfce.org/src/apps/orage/4.8/%{name}-%{version}.tar.bz2 Source1: README.SUSE -# PATCH-FIX-UPSTREAM orage-4.8.2-use-docdir.patch [email protected] -- Use docdir correctly -Patch0: orage-4.8.2-use-docdir.patch +# PATCH-FIX-UPSTREAM orage-use-docdir.patch [email protected] -- Use docdir correctly +Patch0: orage-use-docdir.patch +# PATCH-FIX-UPSTREAM orage-do-not-hardcode-firefox.patch [email protected] -- Do not hardcode firefox and use exo-open instead +Patch1: orage-do-not-hardcode-firefox.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: perl @@ -39,6 +41,7 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) +Requires: exo-tools Requires: xfce4-panel Recommends: %{name}-lang = %{version} Recommends: %{name}-doc = %{version} @@ -68,6 +71,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp %{SOURCE1} . sed -i 's:^Icon=clock:Icon=xfcalendar:' globaltime/globaltime.desktop.in ++++++ orage-4.8.3.tar.bz2 -> orage-4.8.4.tar.bz2 ++++++ ++++ 56669 lines of diff (skipped) ++++++ orage-do-not-hardcode-firefox.patch ++++++ Index: orage-4.8.4/src/mainbox.c =================================================================== --- orage-4.8.4.orig/src/mainbox.c +++ orage-4.8.4/src/mainbox.c @@ -193,7 +193,7 @@ static void mHelp_help_activate_cb(GtkMe #ifdef ORAGE_DEBUG orage_message(-100, P_N); #endif - helpdoc = g_strconcat("firefox ", PACKAGE_DOC_DIR + helpdoc = g_strconcat("exo-open ", PACKAGE_DOC_DIR , G_DIR_SEPARATOR_S, "C" , G_DIR_SEPARATOR_S, "orage.html" , NULL); Index: orage-4.8.4/src/parameters.c =================================================================== --- orage-4.8.4.orig/src/parameters.c +++ orage-4.8.4/src/parameters.c @@ -176,7 +176,7 @@ static void dialog_response(GtkWidget *d if (response_id == GTK_RESPONSE_HELP) { /* Needs to be in " to keep # */ - helpdoc = g_strconcat("firefox \"file://", PACKAGE_DOC_DIR + helpdoc = g_strconcat("exo-open \"file://", PACKAGE_DOC_DIR , G_DIR_SEPARATOR_S, "C" , G_DIR_SEPARATOR_S, "orage.html#orage-preferences-window\"" , NULL); ++++++ orage-use-docdir.patch ++++++ Index: orage-4.8.4/doc/C/Makefile.am =================================================================== --- orage-4.8.4.orig/doc/C/Makefile.am +++ orage-4.8.4/doc/C/Makefile.am @@ -4,12 +4,12 @@ SUBDIRS = \ noinst_DATA = \ orage.xml -docdir=$(datadir)/orage/doc/C +cdocdir=$(docdir)/C -doc_DATA= \ +cdoc_DATA= \ orage.html -EXTRA_DIST = $(noinst_DATA) $(doc_DATA) +EXTRA_DIST = $(noinst_DATA) $(cdoc_DATA) html: $(srcdir)/orage.xml xsltproc $(top_srcdir)/doc/xfce-nochunk.xsl \ Index: orage-4.8.4/doc/C/images/Makefile.am =================================================================== --- orage-4.8.4.orig/doc/C/images/Makefile.am +++ orage-4.8.4/doc/C/images/Makefile.am @@ -1,5 +1,5 @@ -imagesdir = $(datadir)/orage/doc/C/images -images_DATA = \ +cimagesdir = $(docdir)/C/images +cimages_DATA = \ default_calendar.png \ orage_calendar_edit_menu.png \ orage_calendar_file_menu.png \ @@ -18,4 +18,4 @@ images_DATA = \ orage_preferences_main.png \ orage_preferences_extra.png -EXTRA_DIST = $(images_DATA) +EXTRA_DIST = $(cimages_DATA) Index: orage-4.8.4/src/Makefile.am =================================================================== --- orage-4.8.4.orig/src/Makefile.am +++ orage-4.8.4/src/Makefile.am @@ -38,7 +38,8 @@ orage_SOURCES = \ orage_CFLAGS = \ $(LIBGTK_CFLAGS) \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" + -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ + -DPACKAGE_DOC_DIR=\""$(docdir)"\" orage_LDADD = \ $(LIBGTK_LIBS) \ Index: orage-4.8.4/src/mainbox.c =================================================================== --- orage-4.8.4.orig/src/mainbox.c +++ orage-4.8.4/src/mainbox.c @@ -193,9 +193,7 @@ static void mHelp_help_activate_cb(GtkMe #ifdef ORAGE_DEBUG orage_message(-100, P_N); #endif - helpdoc = g_strconcat("firefox ", PACKAGE_DATA_DIR - , G_DIR_SEPARATOR_S, "orage" - , G_DIR_SEPARATOR_S, "doc" + helpdoc = g_strconcat("firefox ", PACKAGE_DOC_DIR , G_DIR_SEPARATOR_S, "C" , G_DIR_SEPARATOR_S, "orage.html" , NULL); Index: orage-4.8.4/src/parameters.c =================================================================== --- orage-4.8.4.orig/src/parameters.c +++ orage-4.8.4/src/parameters.c @@ -176,9 +176,7 @@ static void dialog_response(GtkWidget *d if (response_id == GTK_RESPONSE_HELP) { /* Needs to be in " to keep # */ - helpdoc = g_strconcat("firefox \"file://", PACKAGE_DATA_DIR - , G_DIR_SEPARATOR_S, "orage" - , G_DIR_SEPARATOR_S, "doc" + helpdoc = g_strconcat("firefox \"file://", PACKAGE_DOC_DIR , G_DIR_SEPARATOR_S, "C" , G_DIR_SEPARATOR_S, "orage.html#orage-preferences-window\"" , NULL); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
