[ghostscript/f21] New ghostscript-x11 package for X11 driver (bug #148939).

[Tim Waugh]

commit 4a9a41002c44ee1aae8c752b403773bd8de0882f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Dec 19 09:56:41 2014 +0000

    New ghostscript-x11 package for X11 driver (bug #148939).
    
    - Ghostscript not requiring X11 is now in ghostscript-core.
    - The 'ghostscript' package requires both of these.
    
    Resolves: rhbz#148939

 ghostscript.spec |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 deletions(-)
---
diff --git a/ghostscript.spec b/ghostscript.spec
index 0f790ff..2d88786 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -31,8 +31,8 @@ Patch6: ghostscript-Fontmap.local.patch
 Patch7: ghostscript-wrf-snprintf.patch
 Patch8: ghostscript-system-openjpeg2.patch
 
-Requires: urw-fonts >= 1.1, ghostscript-fonts
-Requires: poppler-data
+Requires: %{name}-core{?_isa} = %{version}-%{release}
+Requires: %{name}-x11{?_isa} = %{version}-%{release}
 BuildRequires: xz
 BuildRequires: libjpeg-devel, libXt-devel
 BuildRequires: zlib-devel, libpng-devel, unzip, gtk3-devel
@@ -88,9 +88,27 @@ BuildArch: noarch
 %description doc
 The documentation files that come with ghostscript.
 
+%package x11
+Summary: The X11 driver for Ghostscript
+Requires: %{name}{?_isa} = %{version}-%{release}
+Group: Applications/Publishing
+
+%description x11
+
+The X11 driver for Ghostscript.
+
+%package core
+Summary: Parts of Ghostscript which do not require X11
+Requires: urw-fonts >= 1.1, ghostscript-fonts
+Requires: poppler-data
+Group: Applications/Publishing
+
+%description core
+The parts of Ghostscript which do not require X11.
+
 %package gtk
 Summary: A GTK-enabled PostScript interpreter and renderer
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}{?_isa} = %{version}-%{release}
 Group: Applications/Publishing
 
 %description gtk
@@ -265,11 +283,11 @@ MAIN_PWD=`pwd`
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post core -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun core -p /sbin/ldconfig
 
-%files -f rpm.sharelist
+%files core -f rpm.sharelist
 %defattr(-,root,root)
 %dir %{_sysconfdir}/ghostscript
 %dir %{_sysconfdir}/ghostscript/%{gs_dot_ver}
@@ -293,9 +311,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so.*
 %{_libdir}/libijs-*.so*
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/%{gs_dot_ver}
+%dir %{_libdir}/%{name}/%{gs_dot_ver}
 %config(noreplace) %{_sysconfdir}/ghostscript/%{gs_dot_ver}/*
 
+%files
+%defattr(-,root,root)
+%{_libdir}/%{name}/%{gs_dot_ver}/X11.so
+
 %files doc
 %defattr(-,root,root)
 %doc %{_datadir}/ghostscript/%{gs_dot_ver}/examples
@@ -305,6 +327,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/gsx
 
+%files x11
+%defattr(-,root,root)
+%{_libdir}/%{name}/%{gs_dot_ver}/X11.so
+
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/ghostscript
@@ -317,6 +343,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Dec 18 2014 Tim Waugh <twaugh at redhat.com> 9.15-4
+- New ghostscript-x11 package for X11 driver (bug #148939).
+- Ghostscript not requiring X11 is now in ghostscript-core.
+- The 'ghostscript' package requires both of these.
+
 * Tue Oct  7 2014 Tim Waugh <twaugh at redhat.com> 9.15-3
 - Avoid shipping ramfs source as its license is unclear. Similarly
   with some documentation and example code (bug #1149617).