rpms/scribes/devel scribes-setup-install-gconf-schemas.patch, NONE, 1.1 scribes-setup-no-dep-check.patch, NONE, 1.1 scribes-setup-no-manual-gconf.patch, NONE, 1.1 scribes.spec, 1.5, 1.6 setup-install-gconf-schemas.patch, 1.1, NONE setup-no-dep-check.patch, 1.1, NONE setup-no-manual-gconf.patch, 1.1, NONE

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15325

Modified Files:
	scribes.spec 
Added Files:
	scribes-setup-install-gconf-schemas.patch 
	scribes-setup-no-dep-check.patch 
	scribes-setup-no-manual-gconf.patch 
Removed Files:
	setup-install-gconf-schemas.patch setup-no-dep-check.patch 
	setup-no-manual-gconf.patch 
Log Message:
Renaming patches (adding "%{name}-" prefixes)

scribes-setup-install-gconf-schemas.patch:

--- NEW FILE scribes-setup-install-gconf-schemas.patch ---
--- setup.py	2006-04-22 18:29:10.000000000 -0700
+++ patched-setup.py	2006-04-22 18:35:33.000000000 -0700
@@ -82,6 +82,7 @@
 	license="GNU GPL v2 and above",
 	packages=["Scribes"],
 	data_files=[
+		("/etc/gconf/schemas", ["data/scribes.schemas"]),
 		("share/applications", ["data/scribes.desktop"]),
 		("share/application-registry", ["data/scribes.application"]),
 		("share/pixmaps", ["data/scribes.svg"]),

scribes-setup-no-dep-check.patch:

--- NEW FILE scribes-setup-no-dep-check.patch ---
--- setup.py	2006-03-04 12:28:07.916137104 -0500
+++ patch.py	2006-03-26 18:54:39.614303696 -0500
@@ -42,94 +42,6 @@
 from distutils.core import setup
 from Scribes.info import version
 
-
-def check_dependencies():
-	u"""
-	Check for Scribes' runtime software dependencies.
-
-	The function aborts the installation process if runtime software
-	dependencies are not met by the host system.
-
-	"""
-
-	try:
-
-		import pygtk
-		pygtk.require("2.0")
-		import gtk
-
-		if gtk.pygtk_version < (2, 8, 0):
-
-			raise ImportError
-
-	except ImportError:
-
-		print "You need PyGTK version 2.8 or later to run Scribes."
-		exit(1)
-
-	try:
-
-		import pygtk
-		pygtk.require("2.0")
-		import gnome
-
-		if gnome.gnome_python_version < (2, 12, 0):
-
-			raise ImportError
-
-	except ImportError:
-
-		print "You need GNOME Python version 2.12 or later to run Scribes"
-		exit(1)
-
-	try:
-
-		import pygtk
-		pygtk.require("2.0")
-		import gtksourceview
-
-	except ImportError:
-
-		print "You need the gtksourceview module in GNOME Python Extras version"
-		print " 2.12 or later to run Scribes."
-		exit(1)
-
-	try:
-
-		import pygtk
-		pygtk.require("2.0")
-		import gtkspell
-
-	except ImportError:
-
-		print "You need the gtkspell module in GNOME Python Extras version"
-		print " 2.12 or later to run Scribes."
-		exit(1)
-
-	# Check to see if Yelp is installed on the host system
-
-	cmd = "which yelp"
-	err, out = getstatusoutput(cmd)
-
-	if err:
-
-		print "You need Yelp version 2.12 or later to run Scribes."
-		exit(1)
-
-	# Check to see if GConf is installed on the host system
-
-	cmd = "which gconftool-2"
-	err, out = getstatusoutput(cmd)
-
-	if err:
-
-		print "You need GConf version 2.12 or later to run Scribes."
-		exit(1)
-
-	return
-
-check_dependencies()
-
 # Trove classification
 
 classifiers = """

scribes-setup-no-manual-gconf.patch:

--- NEW FILE scribes-setup-no-manual-gconf.patch ---
--- setup.py	2006-04-25 20:55:16.000000000 -0700
+++ patch.py	2006-04-25 20:58:52.000000000 -0700
@@ -101,48 +101,3 @@
 		"data/scribes_editing.png", "data/scribes_status.png"])
 	],
 	scripts=["scribes"],)
-
-
-################################################################################
-#
-#							GConf Installation
-#
-################################################################################
-
-# Get gconf's default source
-cmd = "gconftool-2 --get-default-source"
-err, out = getstatusoutput(cmd)
-
-# Set up the gconf environment variable.
-putenv('GCONF_CONFIG_SOURCE', out)
-
-# Install gconf to the default source
-cmd = "gconftool-2 --makefile-install-rule data/scribes.schemas"
-err, out = getstatusoutput(cmd)
-
-if out:
-
-	print "installing GConf schema files"
-
-if err:
-
-    print 'Error: installation of gconf schema files failed: %s' % out
-
-# Kill the GConf daemon
-cmd = "killall gconfd-2"
-err, out = getstatusoutput(cmd)
-
-if err:
-
-	print "Problem shutting down gconf."
-
-# Start the GConf daemon
-cmd = "gconftool-2 --spawn"
-err, out = getstatusoutput(cmd)
-
-if err:
-
-	print "Problem restarting down gconf."
-
-print "scribes installation complete"
-


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scribes.spec	12 Aug 2006 01:34:31 -0000	1.5
+++ scribes.spec	23 Aug 2006 05:21:17 -0000	1.6
@@ -4,16 +4,16 @@
 
 Name:		scribes
 Version:	0.2.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
 URL:		http://scribes.sourceforge.net/           
 
 Source0:	http://openusability.org/download.php/93/%{name}-%{version}.tar.gz
-Patch0:		setup-no-dep-check.patch
-Patch1:		setup-install-gconf-schemas.patch
-Patch2:		setup-no-manual-gconf.patch
+Patch0:		%{name}-setup-no-dep-check.patch
+Patch1:		%{name}-setup-install-gconf-schemas.patch
+Patch2:		%{name}-setup-no-manual-gconf.patch
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Aug 22 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.5-4
+- Rename patches (add "%%{name}-" prefixes)
+
 * Fri Aug 11 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.5-3
 - Include .pyo files in build for new Python packaging guidelines.
 


--- setup-install-gconf-schemas.patch DELETED ---


--- setup-no-dep-check.patch DELETED ---


--- setup-no-manual-gconf.patch DELETED ---