[plplot] - Make plplot-devel require gtk2-devel, libgnomecanvas-devel, libgnomeprint22-devel - Move qt header

Orion Poplawski orion at fedoraproject.org
Fri Feb 6 20:36:31 UTC 2015


commit bb6225639faebbb601071d80dc510b85cbec4d29
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Feb 6 13:36:24 2015 -0700

    - Make plplot-devel require gtk2-devel, libgnomecanvas-devel, libgnomeprint22-devel
    - Move qt header to plplot-qt-devel and make it require qt-devel
    - Move tcl/tk headers to plplot-tk-devel and make it require tk-devel
    - Move wx headers to plplot-wxGTK-devel and make it require wxGTK-devel

 plplot.spec |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index fb6467e..5be09a1 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -165,6 +165,8 @@ Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       gtk2-devel%{?_isa}
+Requires:       libgnomecanvas-devel%{?_isa}
+Requires:       libgnomeprint22-devel%{?_isa}
 
 %description    devel
 %{summary}.
@@ -323,6 +325,7 @@ Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       %{name}-qt%{?_isa} = %{version}-%{release}
+Requires:       qt-devel%{?_isa}
 
 %description    qt-devel
 %{summary}.
@@ -342,6 +345,7 @@ Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       %{name}-tk%{?_isa} = %{version}-%{release}
+Requires:       tk-devel%{?_isa}
 
 # Do not check any tk examples requires
 %global __requires_exclude_from ^%{_datadir}/plplot%{version}/examples/tk/tk.*$
@@ -364,6 +368,7 @@ Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       %{name}-wxGTK%{?_isa} = %{version}-%{release}
+Requires:       wxGTK-devel%{?_isa}
 
 %description    wxGTK-devel
 %{summary}.
@@ -579,6 +584,10 @@ fi
 
 %files devel
 %{_includedir}/plplot/
+%exclude %{_includedir}/plplot/pltcl.h
+%exclude %{_includedir}/plplot/pltk.h
+%exclude %{_includedir}/plplot/qt.h
+%exclude %{_includedir}/plplot/wx*
 %{_libdir}/libcsirocsa.so
 %{_libdir}/libcsironn.so
 %{_libdir}/libplplotcxxd.so
@@ -703,6 +712,7 @@ fi
 %{_libdir}/plplot%{version}/driversd/qt.driver_info
 
 %files qt-devel
+%{_includedir}/plplot/qt.h
 %{_libdir}/libplplotqtd.so
 %{_libdir}/pkgconfig/plplotd-qt.pc
 %doc %{_datadir}/plplot%{version}/examples/cmake/modules/ndp_UseQt4.cmake
@@ -727,6 +737,8 @@ fi
 %{_mandir}/man1/pltcl.1.gz
 
 %files tk-devel
+%{_includedir}/plplot/pltcl.h
+%{_includedir}/plplot/pltk.h
 %{_libdir}/libplplottcltkd.so
 %{_libdir}/libplplottcltk_Maind.so
 %{_libdir}/libtclmatrixd.so
@@ -739,6 +751,7 @@ fi
 %{_libdir}/plplot%{version}/driversd/wxwidgets.driver_info
 
 %files wxGTK-devel
+%{_includedir}/plplot/wx*
 %{_libdir}/libplplotwxwidgetsd.so
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
@@ -748,7 +761,10 @@ fi
 - Rebuild for gcc ada soname bump
 - Add patch for cmake 3.1 support
 - Add patch for libgnat-5 support
-- Make plplot-devel require gtk2-devel
+- Make plplot-devel require gtk2-devel, libgnomecanvas-devel, libgnomeprint22-devel
+- Move qt header to plplot-qt-devel and make it require qt-devel
+- Move tcl/tk headers to plplot-tk-devel and make it require tk-devel
+- Move wx headers to plplot-wxGTK-devel and make it require wxGTK-devel
 
 * Fri Sep 12 2014 Orion Poplawski <orion at cora.nwra.com> - 5.10.0-16
 - Exclude ocaml tests on ppc64le (bug #1140767)


More information about the scm-commits mailing list