rpms/scribes/devel .cvsignore, 1.4, 1.5 scribes-configure.ac-no-python-depcheck.patch, 1.1, 1.2 scribes.spec, 1.12, 1.13 sources, 1.4, 1.5

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	.cvsignore scribes-configure.ac-no-python-depcheck.patch 
	scribes.spec sources 
Log Message:
New upstream version (0.2.9.88); don't hardcode a Pysco requirement (though note it in the %description)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 23:24:16 -0000	1.4
+++ .cvsignore	17 Oct 2006 03:46:43 -0000	1.5
@@ -1 +1 @@
-scribes-0.2.9.87.tar.bz2
+scribes-0.2.9.88.tar.bz2

scribes-configure.ac-no-python-depcheck.patch:

Index: scribes-configure.ac-no-python-depcheck.patch
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes-configure.ac-no-python-depcheck.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scribes-configure.ac-no-python-depcheck.patch	15 Oct 2006 23:24:16 -0000	1.1
+++ scribes-configure.ac-no-python-depcheck.patch	17 Oct 2006 03:46:43 -0000	1.2
@@ -1,21 +1,19 @@
---- configure.ac.orig	2006-10-15 14:04:26.000000000 -0700
-+++ configure.ac	2006-10-15 14:06:14.000000000 -0700
-@@ -3,8 +3,6 @@
- 
- AC_INIT([scribes], [0.2.9.87], [<mystilleef at gmail.com>])
+--- configure.ac.orig	2006-10-16 20:29:29.000000000 -0700
++++ configure.ac	2006-10-16 20:30:22.000000000 -0700
+@@ -3,7 +3,6 @@
  
+ AC_INIT([scribes], [0.2.9.88], [<mystilleef at gmail.com>])
+ GNOME_COMMON_INIT
 -AC_PREREQ(2.60)
--
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([configure.ac])
  AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
-@@ -22,9 +20,6 @@
- AM_GNU_GETTEXT_VERSION
+ AM_MAINTAINER_MODE
+ 
+@@ -29,8 +28,6 @@
+ AM_GCONF_SOURCE_2
  
  AM_PATH_PYTHON([2.4])
 -AC_LANG([C])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [AC_MSG_RESULT([It worked])], [AC_MSG_ERROR([It failed])])
--
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],[[int result = system("python depcheck.py"); if (result != 0) exit(EXIT_FAILURE);]])], [], [AC_MSG_ERROR([Error: Dependency check failed])])
+ 
  AC_CONFIG_FILES([
- intl/Makefile
  po/Makefile.in


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scribes.spec	16 Oct 2006 19:21:47 -0000	1.12
+++ scribes.spec	17 Oct 2006 03:46:43 -0000	1.13
@@ -3,8 +3,8 @@
 %define python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.87
-Release:	4%{?dist}
+Version:	0.2.9.88
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -35,9 +35,6 @@
 Requires:	gnome-python2-gtksourceview >= 2.12
 Requires:	gnome-python2-gtkspell >= 2.12
 Requires:	PyXML
-%ifarch %ix86
-Requires:	python-psyco
-%endif
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -64,7 +61,8 @@
 ...and more are in development!
 
 In order to make use of its runtime documentation facilities, you will need to
-install Yelp.
+install Yelp. Also, you may install the python-psyco package (x86-only) for a
+boost in startup speed.
 
 
 %prep
@@ -103,6 +101,7 @@
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/error.py
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py
+%find_lang %{name}
 
 
 %post
@@ -138,7 +137,7 @@
 scrollkeeper-update -q ||:
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{python_sitelib}/%{python_module_name}/
@@ -154,6 +153,14 @@
 
 
 %changelog
+* Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.88-1
+- Don't hardcode a Pysco requirement at all; but note that option in the
+  %%description for those on x86 who want it, since the %ifarch conditional
+  is done at build time, and a noarch package depending on an arch-specific
+  package which isn't available on all arches is a Bad Idea(TM)
+- Update to upstream version 0.2.9.88
+
+
 * Mon Oct 16 2006 Peter Gordon <peter at thecodergeek.com> - 0.2.9.87-4
 - Make the python-psyco requirement an %%ifarch conditional, as it's x86-only
 - Fix line length of earlier %%changelog entry


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 23:24:16 -0000	1.4
+++ sources	17 Oct 2006 03:46:43 -0000	1.5
@@ -1 +1 @@
-428458fd6f6a457b6e2d693f8cd1c6d3  scribes-0.2.9.87.tar.bz2
+cfcd7e4627b5ff4d77bf20bcd4b39535  scribes-0.2.9.88.tar.bz2