rpms/gnome-schedule/FC-6 gnome-schedule-1.1.0-fix-help-build.patch, NONE, 1.1 gnome-schedule-1.1.0-fix-help-display.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnome-schedule.spec, 1.2, 1.3 sources, 1.2, 1.3

Frank Arnold (farnold) fedora-extras-commits at redhat.com
Mon Mar 19 07:51:11 UTC 2007


Author: farnold

Update of /cvs/extras/rpms/gnome-schedule/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31906

Modified Files:
	.cvsignore gnome-schedule.spec sources 
Added Files:
	gnome-schedule-1.1.0-fix-help-build.patch 
	gnome-schedule-1.1.0-fix-help-display.patch 
Log Message:
* Mon Mar 19 2007 Frank Arnold <frank at scirocco-5v-turbo.de> 1.1.0-1
- Updated to 1.1.0
- Fix for help display problems (GNOME #419213)
- Fix for help build problems (GNOME #409311)
- Added missing BuildRequires


gnome-schedule-1.1.0-fix-help-build.patch:

--- NEW FILE gnome-schedule-1.1.0-fix-help-build.patch ---
diff -urN gnome-schedule-1.1.0.orig/help/C/gnome-schedule.xml gnome-schedule-1.1.0/help/C/gnome-schedule.xml
--- gnome-schedule-1.1.0.orig/help/C/gnome-schedule.xml	2007-02-18 15:50:49.000000000 +0000
+++ gnome-schedule-1.1.0/help/C/gnome-schedule.xml	2007-02-18 15:51:26.000000000 +0000
@@ -85,15 +85,15 @@
       </othercredit>
       
 <!-- Next is to omit the gnome-doc-utils warning: missing element with role maintainer: -->
-<!--    <othercredit role="maintainer">
-      <firstname>Rodrigo</firstname> 
+      <othercredit role="maintainer">
+                  <firstname>Rodrigo</firstname> 
 		  <surname>Marcos Fombellida</surname> 
 		  <affiliation> 
 	  		<orgname>GNOME Documentation Project</orgname> 
 	  		<address> <email>rmarcos at cvs.gnome.org</email> </address> 
 		  </affiliation>
 		  <contrib>Gnome Schedule User Guide maintainance</contrib>
-	  </othercredit> -->
+      </othercredit>
     </authorgroup>
 
 

gnome-schedule-1.1.0-fix-help-display.patch:

--- NEW FILE gnome-schedule-1.1.0-fix-help-display.patch ---
diff -ru gnome-schedule-1.1.0-orig/src/atEditor.py gnome-schedule-1.1.0/src/atEditor.py
--- gnome-schedule-1.1.0-orig/src/atEditor.py	2006-09-17 13:50:54.000000000 +0200
+++ gnome-schedule-1.1.0/src/atEditor.py	2007-03-17 11:18:42.000000000 +0100
@@ -508,7 +508,8 @@
 	def on_at_help_button_clicked (self, *args):
 		try:
 			gnome.help_display_with_doc_id (
-					self.ParentClass.gprogram, '',
+					self.ParentClass.gprogram,
+					self.ParentClass.gprogram.get_app_id (),
 					'gnome-schedule.xml',
 					'myapp-adding-once')
 		except gobject.GError, error:
diff -ru gnome-schedule-1.1.0-orig/src/crontabEditor.py gnome-schedule-1.1.0/src/crontabEditor.py
--- gnome-schedule-1.1.0-orig/src/crontabEditor.py	2006-10-03 15:27:14.000000000 +0200
+++ gnome-schedule-1.1.0/src/crontabEditor.py	2007-03-17 11:19:26.000000000 +0100
@@ -415,7 +415,8 @@
 	def on_cron_help_button_clicked (self, *args):
 		try:
 			gnome.help_display_with_doc_id (
-					self.ParentClass.gprogram, '',
+					self.ParentClass.gprogram,
+					self.ParentClass.gprogram.get_app_id (),
 					'gnome-schedule.xml',
 					'myapp-adding-recurrent')
 		except gobject.GError, error:
diff -ru gnome-schedule-1.1.0-orig/src/mainWindow.py gnome-schedule-1.1.0/src/mainWindow.py
--- gnome-schedule-1.1.0-orig/src/mainWindow.py	2006-11-18 11:21:24.000000000 +0100
+++ gnome-schedule-1.1.0/src/mainWindow.py	2007-03-17 11:17:55.000000000 +0100
@@ -557,7 +557,8 @@
   	def on_manual_menu_activate (self, *args):
 		try:
 			gnome.help_display_with_doc_id (
-					self.gprogram, '',
+					self.gprogram,
+					self.gprogram.get_app_id (),
 					'gnome-schedule.xml', '')
 		except gobject.GError, error:
 			dialog = gtk.MessageDialog (


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-schedule/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 20:48:52 -0000	1.2
+++ .cvsignore	19 Mar 2007 07:50:38 -0000	1.3
@@ -1 +1 @@
-gnome-schedule-1.0.0.tar.gz
+gnome-schedule-1.1.0.tar.gz


Index: gnome-schedule.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-schedule/FC-6/gnome-schedule.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-schedule.spec	29 Aug 2006 21:41:56 -0000	1.2
+++ gnome-schedule.spec	19 Mar 2007 07:50:38 -0000	1.3
@@ -1,19 +1,24 @@
 Name:             gnome-schedule
-Version:          1.0.0
-Release:          2%{?dist}
+Version:          1.1.0
+Release:          1%{?dist}
 Summary:          A GTK+ based user interface for cron and at
 
 Group:            Applications/System
 License:          GPL
 URL:              http://gnome-schedule.sf.net
 Source0:          http://dl.sf.net/gnome-schedule/%{name}-%{version}.tar.gz
+
+Patch1:           gnome-schedule-1.1.0-fix-help-display.patch
+Patch2:           gnome-schedule-1.1.0-fix-help-build.patch
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    pygtk2-devel >= 2.6
+BuildRequires:    gnome-python2-devel >= 2.12.0
 BuildRequires:    gnome-doc-utils >= 0.3.2
 BuildRequires:    glib2-devel gettext desktop-file-utils intltool
-BuildRequires:    at vixie-cron
+BuildRequires:    gnome-python2-gconf at vixie-cron
 Requires:         pygtk2-libglade >= 2.6
 Requires:	  gnome-python2-applet gnome-python2-gconf at vixie-cron
 Requires(post):   scrollkeeper
@@ -27,9 +32,8 @@
 
 %prep
 %setup -q
-sed -i -e "/^#!\/usr\/bin\/python/d"	\
-	  src/gnome-schedule.py		\
-	  src/scheduleapplet.py
+%patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -76,6 +80,12 @@
 
 
 %changelog
+* Mon Mar 19 2007 Frank Arnold <frank at scirocco-5v-turbo.de> 1.1.0-1
+- Updated to 1.1.0
+- Fix for help display problems (GNOME #419213)
+- Fix for help build problems (GNOME #409311)
+- Added missing BuildRequires
+
 * Tue Aug 29 2006 Frank Arnold <frank at scirocco-5v-turbo.de> 1.0.0-2
 - Added BuildRequires intltool for reduced mock setup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-schedule/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 20:48:52 -0000	1.2
+++ sources	19 Mar 2007 07:50:38 -0000	1.3
@@ -1 +1 @@
-52b179c43135048ede51579a3e048019  gnome-schedule-1.0.0.tar.gz
+c9344f8c326e3392ed49134a105f4ea9  gnome-schedule-1.1.0.tar.gz




More information about the fedora-extras-commits mailing list