[meego-commits] 15116: Changes to Trunk:Testing/gcalctool

[Wang Quanxian]

Hi,
I have made the following changes to gcalctool in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Wang Quanxian

[This message was auto-generated]

---

Request #15116:

  submit:   home:quanxianwang:branches:Trunk:Testing/gcalctool(r6)(cleanup) -> Trunk:Testing/gcalctool


Message:
    Fix the license issue bmc#14294

State:   new          2011-03-22T21:28:24 quanxianwang
Comment: None



changes files:
--------------
--- gcalctool.changes
+++ gcalctool.changes
@@ -0,0 +1,3 @@
+* Wed Mar 23 2011 Quanxian Wang <quanxian.wang at intel.com> - 5.25.91
+- Fix the license issue bmc#14294
+

new:
----
  license.patch

spec files:
-----------
--- gcalctool.spec
+++ gcalctool.spec
@@ -8,6 +8,7 @@
 URL:            http://directory.fsf.org/gcalctool.html
 Source0:        http://download.gnome.org/sources/gcalctool/5.25/gcalctool-%{version}.tar.bz2
 Source1:        gnome-gcalctool.desktop
+Patch0 :        license.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-scrollkeeper

other changes:
--------------

++++++ license.patch (new)
--- license.patch
+++ license.patch
+--- 25/gcalctool/gtk.c_orig	2011-03-23 17:23:39.726259083 +0800
++++ 25/gcalctool/gtk.c	2011-03-23 17:24:36.206090330 +0800
+@@ -1201,9 +1201,7 @@ about_cb(GtkWidget *widget)
+     /* Translators: The translator credits. Please translate this with your name(s). */
+     const gchar *translator_credits = _("translator-credits");
+ 
+-    char *license[] = {
+-        /* Translators: The license this software is under (GPL2+) */
+-        _("Gcalctool is free software; you can redistribute it and/or modify\n"
++    char *license = _("Gcalctool is free software; you can redistribute it and/or modify\n"
+           "it under the terms of the GNU General Public License as published by\n"
+           "the Free Software Foundation; either version 2 of the License, or\n"
+           "(at your option) any later version.\n"
+@@ -1215,8 +1213,7 @@ about_cb(GtkWidget *widget)
+           "\n"
+           "You should have received a copy of the GNU General Public License\n"
+           "along with Gcalctool; if not, write to the Free Software Foundation, Inc.,\n"
+-          "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\n")
+-    };
++          "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\n");
+ 
+     gtk_show_about_dialog(GTK_WINDOW(X.kframe),
+                           /* Translators: Program name in the about dialog */