--- a/ChangeLog Wed Aug 20 13:49:41 2003 +0000
+++ b/ChangeLog Wed Aug 20 14:12:18 2003 +0000
@@ -1,3 +1,9 @@
+2003-08-20 Laszlo Kovacs <[email protected]>
+
+ * bug-buddy.spec:
+ add bug-buddy-04-remove-ximian-druid-pages.diff
+ * patches/bug-buddy-04-remove-ximian-druid-pages.diff: added
+
2003-08-20 Stephen Browne <[email protected]>
* patches/nautilus-04-this-computer-and-documents.diff:
--- a/bug-buddy.spec Wed Aug 20 13:49:41 2003 +0000
+++ b/bug-buddy.spec Wed Aug 20 14:12:18 2003 +0000
@@ -2,7 +2,7 @@
License: GPL
Group: System/GUI/GNOME
Version: 2.2.106
-Release: 6
+Release: 7
Distribution: Mercury
Vendor: Sun Microsystems, Inc.
Summary: GNOME 2.0 Bug Reporting Tool
@@ -10,6 +10,7 @@
Patch1: bug-buddy-01-potfiles_in.diff
Patch2: bug-buddy-02-menu-entry.diff
Patch3: bug-buddy-03-sensical-check-removed.diff
+Patch4: bug-buddy-04-remove-ximian-druid-pages.diff
URL: www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_docdir}/bug-buddy
@@ -33,6 +34,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
libtoolize --force
@@ -48,6 +50,9 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
+%post
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/bug-buddy/bugzilla
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,6 +69,8 @@
%changelog
+* Tue Aug 19 2003 - [email protected]
+- add bug-buddy-04-remove-ximian-druid-pages.diff
* Tue Aug 05 2003 - [email protected]
- add bug-buddy-03-sensical-check-removed.diff
* Tue Aug 05 2003 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/bug-buddy-04-remove-ximian-druid-pages.diff Wed Aug 20 14:12:18 2003 +0000
@@ -0,0 +1,218 @@
+--- bug-buddy-2.2.106/src/bugzilla.c 2003-06-07 03:12:17.000000000 +0100
++++ bug-buddy-2.2.106.mod/src/bugzilla.c 2003-08-18 16:22:45.000000000 +0100
+@@ -1420,7 +1420,7 @@
+
+ severity = druid_data.severity ? druid_data.severity : "Normal";
+
+- if (include_headers)
++/* if (include_headers) */
+ g_string_append_printf (email, "Subject: %s\n\n", subject);
+
+ if (!is_bugzilla) {
+--- bug-buddy-2.2.106/src/bug-buddy.c 2002-12-16 22:43:30.000000000 +0000
++++ bug-buddy-2.2.106.mod/src/bug-buddy.c 2003-08-15 14:56:27.000000000 +0100
+@@ -730,7 +730,7 @@
+
+ init_gnome_version_stuff ();
+ init_ui ();
+-
++/*
+ load_bugzillas ();
+ if (druid_data.need_to_download) {
+ int response;
+@@ -775,10 +775,11 @@
+ }
+
+ load_bugzilla_xml ();
++*/
+
+ gtk_widget_show (GET_WIDGET ("druid-window"));
+
+- load_applications ();
++/* load_applications ();*/
+ start_gdb ();
+
+ gtk_main ();
+--- bug-buddy-2.2.106/src/united-states-of-bug-buddy.c 2003-08-19 17:37:27.000000000 +0100
++++ bug-buddy-2.2.106.mod/src/united-states-of-bug-buddy.c 2003-08-19 17:50:54.000000000 +0100
+@@ -206,6 +206,7 @@
+
+ switch (druid_data.state) {
+ case STATE_DESC:
++/*
+ if (!druid_data.mostfreq_skipped) {
+ newstate = STATE_MOSTFREQ;
+ break;
+@@ -219,6 +220,7 @@
+ newstate = STATE_PRODUCT;
+ break;
+ }
++*/
+ newstate = STATE_GDB;
+ break;
+ case STATE_MOSTFREQ:
+@@ -485,12 +487,14 @@
+ name = buddy_get_text ("email-name-entry");
+ from = buddy_get_text ("email-email-entry");
+
++
+ g_string_append_printf (buf, "From: %s <%s>\n", name, from);
+
+ g_free (from);
+ g_free (name);
+
+- to = buddy_get_text ("email-to-entry");
++/* to = buddy_get_text ("email-to-entry"); */
++ to = "[email protected]";
+ g_string_append_printf (buf, "To: %s\n", to);
+
+ s = buddy_get_text ("email-cc-entry");
+@@ -545,7 +549,7 @@
+ goto submit_ok_out;
+ }
+
+- s = g_strdup_printf (_("Your bug report has been submitted to:\n\n <%s>\n\nThanks!"), to);
++ s = g_strdup_printf (_("Your bug report has been submitted!"));
+ }
+
+ buddy_set_text ("finished-label", s);
+@@ -638,6 +642,7 @@
+ switch (druid_data.state) {
+ case STATE_GDB:
+ {
++ /*
+ BugzillaApplication *application;
+ BugzillaProduct *product;
+ BugzillaBTS *bts;
+@@ -679,6 +684,8 @@
+ druid_data.mostfreq_skipped = TRUE;
+ }
+ }
++ */
++ newstate = STATE_DESC;
+ break;
+ }
+ case STATE_PRODUCT:
+--- bug-buddy-2.2.106/src/bug-buddy.glade 2002-12-29 17:03:47.000000000 +0000
++++ bug-buddy-2.2.106.mod/src/bug-buddy.glade 2003-08-18 16:20:35.000000000 +0100
+@@ -1269,8 +1269,7 @@
+ <child>
+ <widget class="GtkLabel" id="label153">
+ <property name="visible">True</property>
+- <property name="label" translatable="yes">Bug Buddy uses email to submit the bug reports.
+-Please choose how you would like Bug Buddy to send email.</property>
++ <property name="label" translatable="yes">Please provide your name and email address.</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+@@ -1290,7 +1289,6 @@
+
+ <child>
+ <widget class="GtkRadioButton" id="email-sendmail-radio">
+- <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use sendmail directly</property>
+ <property name="use_underline">True</property>
+@@ -1309,7 +1307,6 @@
+
+ <child>
+ <widget class="GtkRadioButton" id="email-file-radio">
+- <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Just save to a file so I can submit a bug report manually</property>
+ <property name="use_underline">True</property>
+@@ -1399,7 +1396,6 @@
+
+ <child>
+ <widget class="GtkLabel" id="email-sendmail-label">
+- <property name="visible">True</property>
+ <property name="label" translatable="yes">Path of sendmail</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+@@ -1423,14 +1419,12 @@
+
+ <child>
+ <widget class="GnomeFileEntry" id="email-sendmail-gnome-entry">
+- <property name="visible">True</property>
+ <property name="max_saved">10</property>
+ <property name="directory_entry">False</property>
+ <property name="modal">False</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="email-sendmail-entry">
+- <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+@@ -1507,22 +1501,7 @@
+ </child>
+
+ <child>
+- <widget class="GtkLabel" id="label176">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Sendmail Settings</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- </widget>
+- <packing>
+- <property name="type">label_item</property>
+- </packing>
++ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+@@ -1587,7 +1566,6 @@
+
+ <child>
+ <widget class="GtkTable" id="email-to-table">
+- <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+@@ -1596,7 +1574,6 @@
+
+ <child>
+ <widget class="GtkLabel" id="email-cc-label">
+- <property name="visible">True</property>
+ <property name="label" translatable="yes">Cc</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+@@ -1620,7 +1597,6 @@
+
+ <child>
+ <widget class="GtkLabel" id="email-to-label">
+- <property name="visible">True</property>
+ <property name="label" translatable="yes">To</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+@@ -1644,7 +1620,6 @@
+
+ <child>
+ <widget class="GnomeEntry" id="email-cc-gnome-entry">
+- <property name="visible">True</property>
+ <property name="history_id">email-cc-gnome-entry</property>
+ <property name="max_saved">10</property>
+
+@@ -1673,7 +1648,6 @@
+
+ <child>
+ <widget class="GnomeEntry" id="email-to-gnome-entry">
+- <property name="visible">True</property>
+ <property name="history_id">email-to-gnome-entry</property>
+ <property name="max_saved">10</property>
+
+@@ -1709,7 +1683,6 @@
+
+ <child>
+ <widget class="GtkHBox" id="email-save-in-box">
+- <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
+