From 1bc562910803c185287ebbf731f4bd5f918e1fae Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 28 Aug 2006 17:23:31 +0000 Subject: [PATCH] - Add another hunk to the patch for RH bug #201541. - Add patch for RH bug #202289. --- evolution-2.7.92-fix-prgname.patch | 11 +++++++++++ evolution.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 evolution-2.7.92-fix-prgname.patch diff --git a/evolution-2.7.92-fix-prgname.patch b/evolution-2.7.92-fix-prgname.patch new file mode 100644 index 0000000..98689f4 --- /dev/null +++ b/evolution-2.7.92-fix-prgname.patch @@ -0,0 +1,11 @@ +--- evolution-2.7.92/shell/main.c.fix-prgname 2006-08-28 11:04:44.000000000 -0400 ++++ evolution-2.7.92/shell/main.c 2006-08-28 11:04:56.000000000 -0400 +@@ -516,7 +516,7 @@ + + g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); + +- program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, ++ program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, + GNOME_PROGRAM_STANDARD_PROPERTIES, + GNOME_PARAM_GOPTION_CONTEXT, context, + GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"), diff --git a/evolution.spec b/evolution.spec index 7083e38..a4d791f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.92 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -135,6 +135,9 @@ Patch36: evolution-2.7.92-deprecated-gdk.patch # RH bug #201541 / Gnome.org bug #336983 Patch37: evolution-2.7.92-fix-edit-copy.patch +# RH bug #202289 +Patch38: evolution-2.7.92-fix-prgname.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -274,6 +277,7 @@ Development files needed for building things which link against evolution. %patch35 -p1 -b .deprecated-glib %patch36 -p1 -b .deprecated-gdk %patch37 -p1 -b .fix-edit-copy +%patch38 -p1 -b .fix-prgname mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -664,6 +668,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 28 2006 Matthew Barnes - 2.7.92-6.fc6 +- Add another hunk to the patch for RH bug #201541. +- Add patch for RH bug #202289. + * Mon Aug 28 2006 Matthew Barnes - 2.7.92-5.fc6 - Add patch for RH bug #201541.