rpms/scribes/devel scribes-fix-Job.py-print-header-path.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 scribes.spec, 1.26, 1.27 sources, 1.11, 1.12

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	.cvsignore scribes.spec sources 
Added Files:
	scribes-fix-Job.py-print-header-path.patch 
Log Message:
* Tue Apr 24 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.1-1
- Update to new upstream release (0.3.2.1).
- Add patch to fix the header of print jobs (incomplete filenames):
  + fix-Job.py-print-header-path.patch
- Move %configure call to %build stage (%prep should only be source
  unpacking/patching/etc).
- Reorder scriptlets (aesthetic change only).


scribes-fix-Job.py-print-header-path.patch:

--- NEW FILE scribes-fix-Job.py-print-header-path.patch ---
--- plugins/PrintDialog/Job.py.orig	2007-04-24 16:09:09.000000000 -0700
+++ plugins/PrintDialog/Job.py	2007-04-24 16:09:50.000000000 -0700
@@ -73,7 +73,8 @@
 		@type editor: An Editor object.
 		"""
 		from i18n import msg0003
-		self.__header = msg0003 + str(editor.uri)
+		from urllib import url2pathname
+		self.__header = msg0003 + str(url2pathname(editor.uri))
 		return
 
 	def __set_properties(self):


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Apr 2007 17:39:19 -0000	1.11
+++ .cvsignore	24 Apr 2007 23:23:13 -0000	1.12
@@ -1 +1 @@
-scribes-0.3.2.tar.bz2
+scribes-0.3.2.1.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- scribes.spec	1 Apr 2007 20:16:42 -0000	1.26
+++ scribes.spec	24 Apr 2007 23:23:13 -0000	1.27
@@ -3,7 +3,7 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.3.2
+Version:	0.3.2.1
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -12,6 +12,7 @@
 
 Source0:	http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-configure.ac-no-python-depcheck.patch
+Patch1:		%{name}-fix-Job.py-print-header-path.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -74,33 +75,28 @@
 
 %prep
 %setup -q
-# Patch out the configure script's call to depcheck.py, since I've ensured
-# that the deps are satisfied and the depcheck.py script is happy on its own,
-# though fails when run through rpmbuild...
+## Patch out the configure script's call to depcheck.py, since I've ensured
+## that the deps are satisfied and the depcheck.py script is happy on its own,
+## though fails when run through rpmbuild...
 %patch0 -p0
-# ..then recreate the configure script from the new configure.ac file...
+## ..then recreate the configure script from the new configure.ac file...
 %{__autoconf}
-# ..then recreate the root Makefile.in for the configure script to use...
+## ..then recreate the root Makefile.in for the configure script to use...
 %{__aclocal}
 %{__automake} Makefile
-find . -type f -exec sed -i -e "s/@MKDIR_P@/@mkdir_p@/g" '{}' \; 
-# ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
-# since they'll be installed with the scriptlets.
-%configure --disable-scrollkeeper --disable-schemas-install --enable-nls
+find . -type f -exec sed -i -e "s/@MKDIR_P@/@mkdir_p@/g" '{}' \;
+## Fix the print headers when the path name contains whitespace.
+%patch1 -p0 
+
 
 
 %build
+## Srollkeeper and GConf schema installations are disabled since they'll be
+## handled with the scriptlets.
+%configure --disable-scrollkeeper --disable-schemas-install --enable-nls
 make %{?_smp_mflags}
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
-fi
-
-
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -115,6 +111,18 @@
 %find_lang %{name}
 
 
+%clean
+rm -rf %{buildroot}
+
+
+%pre
+if [ "$1" -gt 1 ]; then
+	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+	gconftool-2 --makefile-uninstall-rule \
+		%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
+fi
+
+
 %post
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule \
@@ -125,10 +133,6 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
@@ -159,6 +163,14 @@
 
 
 %changelog
+* Tue Apr 24 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2.1-1
+- Update to new upstream release (0.3.2.1).
+- Add patch to fix the header of print jobs (incomplete filenames):
+  + fix-Job.py-print-header-path.patch
+- Move %%configure call to %%build stage (%%prep should only be source
+  unpacking/patching/etc).
+- Reorder scriptlets (aesthetic change only).
+
 * Sun Apr 01 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.2-1
 - Update to new upstream release (0.3.2).
 - Update %%post and %%postun scriplets for new icon-cache guidelines. 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Apr 2007 17:39:19 -0000	1.11
+++ sources	24 Apr 2007 23:23:13 -0000	1.12
@@ -1 +1 @@
-93b052fce4b1975020b0b6521c1bb920  scribes-0.3.2.tar.bz2
+0c6470c4958f1004b9c0a74aaaedffe9  scribes-0.3.2.1.tar.bz2