Author: orion
Update of /cvs/extras/rpms/plplot/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20880
Modified Files:
.cvsignore plplot.spec sources
Removed Files:
plplot-5.5.3-octave.patch plplot-5.5.3-tk.patch
plplot-5.5.3-x86_64.patch
Log Message:
- Update to 5.6.1
- Remove patches applied upstream
- Now include pkgconfig files
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 9 May 2006 17:57:10 -0000 1.5
+++ .cvsignore 31 May 2006 20:16:46 -0000 1.6
@@ -1 +1 @@
-plplot-5.6.0.tar.gz
+plplot-5.6.1.tar.gz
Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plplot.spec 9 May 2006 17:57:10 -0000 1.4
+++ plplot.spec 31 May 2006 20:16:46 -0000 1.5
@@ -1,7 +1,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: plplot
-Version: 5.6.0
+Version: 5.6.1
Release: 1%{?dist}
Summary: Library of functions for making scientific plots
@@ -10,9 +10,6 @@
URL:
http://plplot.sourceforge.net/
Source0:
http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz
Patch0: plplot-5.5.3-matwrap.patch
-Patch1: plplot-5.5.3-tk.patch
-Patch3: plplot-5.5.3-x86_64.patch
-Patch4: plplot-5.5.3-octave.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel
@@ -60,6 +57,7 @@
Summary: Development headers and libraries for PLplot
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
%description devel
%{summary}.
@@ -79,6 +77,7 @@
Requires: %{name} = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-gnome = %{version}-%{release}
+Requires: pkgconfig
%description gnome-devel
%{summary}.
@@ -128,6 +127,7 @@
Requires: %{name} = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-tk = %{version}-%{release}
+Requires: pkgconfig
%description tk-devel
%{summary}.
@@ -145,9 +145,6 @@
%prep
%setup -q
%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
-%patch3 -p1 -b .orig
-%patch4 -p1 -b .orig
%build
@@ -272,6 +269,10 @@
%{_libdir}/libplplotd.so
%{_libdir}/libplplotf77cd.so
%{_libdir}/libplplotf77d.so
+%{_libdir}/pkgconfig/plplotd.pc
+%{_libdir}/pkgconfig/plplotd-c++.pc
+%{_libdir}/pkgconfig/plplotd-f77.pc
+%{_libdir}/pkgconfig/plplotd-f95.pc
%{_datadir}/plplot%{version}/examples/c/
%{_datadir}/plplot%{version}/examples/c++/
%{_datadir}/plplot%{version}/examples/f77/
@@ -292,6 +293,7 @@
%files gnome-devel
%defattr(-,root,root,-)
%{_libdir}/libplplotgnome2d.so
+%{_libdir}/pkgconfig/plplotd-gnome2.pc
%ifarch %{ix86} x86_64
%files java
@@ -330,6 +332,7 @@
%defattr(-,root,root,-)
%{_libdir}/libplplottcltkd.so
%{_libdir}/libtclmatrixd.so
+%{_libdir}/pkgconfig/plplotd-tcl.pc
%{_datadir}/plplot%{version}/examples/tcl/
%{_datadir}/plplot%{version}/examples/tk/
@@ -340,6 +343,11 @@
%changelog
+* Wed May 31 2006 - Orion Poplawski <orion(a)cora.nwra.com> - 5.6.1-1
+- Update to 5.6.1
+- Remove patches applied upstream
+- Now include pkgconfig files
+
* Tue May 9 2006 - Orion Poplawski <orion(a)cora.nwra.com> - 5.6.0-1
- Update to 5.6.0 with new psttf driver
- Add wxGTK support
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 May 2006 17:57:10 -0000 1.5
+++ sources 31 May 2006 20:16:46 -0000 1.6
@@ -1 +1 @@
-0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz
+51029b256f3333449de9bcd3e00c088f plplot-5.6.1.tar.gz
--- plplot-5.5.3-octave.patch DELETED ---
--- plplot-5.5.3-tk.patch DELETED ---
--- plplot-5.5.3-x86_64.patch DELETED ---