rpms/plplot/devel plplot-5.6.1-info.patch, NONE, 1.1 plplot.spec, 1.18, 1.19 plplot-5.6.1-texi.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.6.1-info.patch 
Removed Files:
	plplot-5.6.1-texi.patch 
Log Message:
- Add needed Requires for -devel packages (bug #202168)
- Patch .info rather than .texi, and actually apply


plplot-5.6.1-info.patch:

--- NEW FILE plplot-5.6.1-info.patch ---
--- plplot-5.6.1/doc/docbook/src/plplotdoc.info.orig	2006-09-25 10:32:09.000000000 -0600
+++ plplot-5.6.1/doc/docbook/src/plplotdoc.info	2006-09-25 10:33:47.000000000 -0600
@@ -1,8 +1,9 @@
 This is info/plplotdoc.info, produced by makeinfo version 4.8 from
 plplotdoc.texi.
 
+INFO-DIR-SECTION Scientific Visualization
 START-INFO-DIR-ENTRY
-* The PLplot Plotting Library: .   ???
+* PLplot: (plplotdoc).               The PLplot Plotting Library.
 END-INFO-DIR-ENTRY
 
 


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plplot.spec	28 Aug 2006 19:38:47 -0000	1.18
+++ plplot.spec	25 Sep 2006 16:49:52 -0000	1.19
@@ -11,7 +11,7 @@
 Source0:        http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz
 Patch0:         plplot-5.5.3-matwrap.patch
 Patch1:         plplot-5.6.1-octave.patch
-Patch2:         plplot-5.6.1-texi.patch
+Patch2:         plplot-5.6.1-info.patch
 Patch6:         plplot-5.6.0-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,6 +56,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
+Requires:       qhull-devel, freetype-devel
 
 %description    devel
 %{summary}.
@@ -76,6 +77,7 @@
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       %{name}-gnome = %{version}-%{release}
 Requires:       pkgconfig
+Requires:       libgnomecanvas-devel, libgnomeprintui22-devel
 
 %description    gnome-devel
 %{summary}.
@@ -142,6 +144,7 @@
 %setup -q
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .octave
+%patch2 -p1 -b .orig
 %patch6 -p1 -b .orig
 
 
@@ -234,16 +237,10 @@
 %{_libdir}/plplot%{version}/driversd/xwin.rc
 %{_libdir}/plplot%{version}/driversd/xwin.so
 %{python_sitelib}/_plplotcmodule.so
-%{python_sitelib}/plplot.py
-%{python_sitelib}/plplot.pyc
-%{python_sitelib}/plplot.pyo
+%{python_sitelib}/plplot.py*
 %{python_sitelib}/plplot_widgetmodule.so
-%{python_sitelib}/plplotc.py
-%{python_sitelib}/plplotc.pyc
-%{python_sitelib}/plplotc.pyo
-%{python_sitelib}/plplotcanvas.py
-%{python_sitelib}/plplotcanvas.pyc
-%{python_sitelib}/plplotcanvas.pyo
+%{python_sitelib}/plplotc.py*
+%{python_sitelib}/plplotcanvas.py*
 %{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
@@ -350,6 +347,10 @@
 
 
 %changelog
+* Mon Sep 25 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-5
+- Add needed Requires for -devel packages (bug #202168)
+- Patch .info rather than .texi, and actually apply
+
 * Mon Aug 28 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-4
 - Rebuild for new octave API version
 - Add patch for texinfo file to fix category


--- plplot-5.6.1-texi.patch DELETED ---