rpms/scribes/FC-6 .cvsignore, 1.9, 1.10 scribes.spec, 1.19, 1.20 sources, 1.9, 1.10 scribes-fix-plugins-installation-dir.patch, 1.1, NONE

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3601

Modified Files:
	.cvsignore scribes.spec sources 
Removed Files:
	scribes-fix-plugins-installation-dir.patch 
Log Message:
Update to new upstream release (0.3.1); many spec cleanups.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Dec 2006 05:11:10 -0000	1.9
+++ .cvsignore	17 Mar 2007 18:04:44 -0000	1.10
@@ -1 +1 @@
-scribes-0.3.20061218bzr.tar.bz2
+scribes-0.3.1.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scribes.spec	19 Dec 2006 05:08:38 -0000	1.19
+++ scribes.spec	17 Mar 2007 18:04:44 -0000	1.20
@@ -1,25 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define	python_module_name	SCRIBES
-%define	alphatag		.20061218bzr
 
 Name:		scribes
-Version:	0.3
-Release:	2%{?alphatag}%{?dist}
+Version:	0.3.1
+Release:	1%{?alphatag}%{?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://heanet.dl.sourceforge.net/scribes/scribes-%{version}.tar.bz2
-# This is a source snapshot dated 2006-12-18, thus no URI. Instructions to
-# retrieve it are as follows (the initial '$' character is one's shell prompt):
-# $ bzr get -r 83 http://scribes.sourceforge.net/bzr/scribes
-# $ rm -rf scribes/.bzr*
-# $ tar -cvjpf scribes-0.3.20061218bzr.tar.bz2 scribes
-Source0:	scribes-%{version}%{alphatag}.tar.bz2
+Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-configure.ac-no-python-depcheck.patch
-Patch1:		%{name}-fix-plugins-installation-dir.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -34,8 +26,11 @@
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
 
+## pygtk2 depends on gtk2 as a run-time dependency, which in turn depends on
+## hicolor-icon-theme; thus the %%_datadir/icons/hicolor directory tree is not
+## left orphaned. It [pygtk2] also brings in pygobject2 as a run-time
+## dependency for us.
 Requires:	dbus-python >= 0.70
-Requires:	pygobject2
 Requires:	pygtk2 >= 2.10
 Requires:	python >= 2.4
 Requires:	gnome-python2-gconf >= 2.12
@@ -75,16 +70,13 @@
 
 
 %prep
-%setup -q -n "%{name}"
+%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...
 %patch0 -p0
 # ..then recreate the configure script from the new configure.ac file...
 %{__autoconf}
-# ...then patch the Makefile.am to properly install the plugins to
-# $(DESTDIR)$(datadir)...
-%patch1 -p0
 # ..then recreate the root Makefile.in for the configure script to use...
 %{__automake} Makefile
 # ...and now configure it. Scrollkeeper and GConf schema stuff are disabled
@@ -161,10 +153,18 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/omf/%{name}/
-%config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Sat Mar 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.3.1-1
+- Update to new upstream release (0.3.1).
+- Update Source0 URL
+- Drop pygobject2 as a run-time dependency (since it's pulled in by pygtk2).
+- Drop the fix-plugins-installation-dir patch (this bug was fixed upstream):
+  - fix-plugins-installation-dir.patch
+- Don't mark installed GConf schemas file as %%config.
+
 * Mon Dec 18 2006 Peter Gordon <peter at thecodergeek.com> - 0.3-2.20061218bzr
 - Update to 2006-12-18 BZR snapshot. This should fix the longstanding bug
   wherein a zombie .scribesclient process is left which becomes incredibly


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Dec 2006 05:11:10 -0000	1.9
+++ sources	17 Mar 2007 18:04:44 -0000	1.10
@@ -1 +1 @@
-b957d8a8bbb6fd6135a62e55e570ff46  scribes-0.3.20061218bzr.tar.bz2
+3c6e15b3beab3adc09ac0c4abed3290f  scribes-0.3.1.tar.bz2


--- scribes-fix-plugins-installation-dir.patch DELETED ---