rpms/scribes/FC-6 scribes-fix-plugins-installation-dir.patch, NONE, 1.1 scribes.spec, 1.18, 1.19

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	scribes.spec 
Added Files:
	scribes-fix-plugins-installation-dir.patch 
Log Message:
Update to 2006-12-18 BZR snapshot; add more %doc files, 

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

--- NEW FILE scribes-fix-plugins-installation-dir.patch ---
--- Makefile.am.old	2006-12-18 20:05:22.000000000 -0800
+++ Makefile.am	2006-12-18 20:05:39.000000000 -0800
@@ -43,6 +43,6 @@
 	gnome-doc-utils.make
 
 install-data-hook:
-	cp -R plugins $(datadir)/scribes
+	cp -R plugins $(DESTDIR)$(datadir)/scribes
 	chmod 755 $(DESTDIR)$(startupdir)/$(startup_script)
 	chmod 755 $(DESTDIR)$(startupdir)/$(other_script)


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scribes.spec	4 Nov 2006 20:16:24 -0000	1.18
+++ scribes.spec	19 Dec 2006 05:08:38 -0000	1.19
@@ -1,17 +1,25 @@
 %{!?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:	1%{?dist}
+Release:	2%{?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
+## 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
 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
@@ -22,6 +30,7 @@
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	scrollkeeper
 BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	gnome-doc-utils
 BuildRequires:	GConf2
 
@@ -66,13 +75,18 @@
 
 
 %prep
-%setup -q
+%setup -q -n "%{name}"
 # 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
 # since they'll be installed with the scriptlets.
 %configure --disable-scrollkeeper --disable-schemas-install --enable-nls
@@ -95,7 +109,6 @@
 make DESTDIR=%{buildroot} install
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--add-category X-Fedora	\
 	--delete-original	\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/syntax.py
@@ -139,10 +152,9 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog CONTRIBUTORS COPYING NEWS README TRANSLATORS TODO
 %{python_sitelib}/%{python_module_name}/
 %{_bindir}/%{name}
-%{_bindir}/.scribesclient
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/gnome/help/%{name}/
@@ -153,6 +165,16 @@
 
 
 %changelog
+* 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
+  processor-intensive, since the internal IPC has been reworked; also includes
+  various updated translations.
+- Don't add the X-Fedora category to the installed .desktop file
+- Add CONTRIBUTORS, TRANSLATORS, and TODO files as %%doc
+- Add patch to install plugins to proper $(DESTDIR) location:
+  + fix-plugins-installation-dir.patch
+
 * Sat Nov 04 2006 Peter Gordon <peter at thecodergeek.com> - 0.3-1
 - Update to new upstream release (0.3 final)