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
This commit is contained in:
Tim Waugh 2014-12-19 09:56:41 +00:00
parent 956b783e71
commit 4a9a41002c

View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
Name: ghostscript Name: ghostscript
Version: %{gs_ver} Version: %{gs_ver}
Release: 3%{?dist} Release: 4%{?dist}
# Included CMap data is Redistributable, no modification permitted, # Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510 # see http://bugzilla.redhat.com/487510
@ -31,8 +31,8 @@ Patch6: ghostscript-Fontmap.local.patch
Patch7: ghostscript-wrf-snprintf.patch Patch7: ghostscript-wrf-snprintf.patch
Patch8: ghostscript-system-openjpeg2.patch Patch8: ghostscript-system-openjpeg2.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts Requires: %{name}-core{?_isa} = %{version}-%{release}
Requires: poppler-data Requires: %{name}-x11{?_isa} = %{version}-%{release}
BuildRequires: xz BuildRequires: xz
BuildRequires: libjpeg-devel, libXt-devel BuildRequires: libjpeg-devel, libXt-devel
BuildRequires: zlib-devel, libpng-devel, unzip, gtk3-devel BuildRequires: zlib-devel, libpng-devel, unzip, gtk3-devel
@ -88,9 +88,27 @@ BuildArch: noarch
%description doc %description doc
The documentation files that come with ghostscript. 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 %package gtk
Summary: A GTK-enabled PostScript interpreter and renderer Summary: A GTK-enabled PostScript interpreter and renderer
Requires: %{name} = %{version}-%{release} Requires: %{name}{?_isa} = %{version}-%{release}
Group: Applications/Publishing Group: Applications/Publishing
%description gtk %description gtk
@ -265,11 +283,11 @@ MAIN_PWD=`pwd`
%clean %clean
rm -rf $RPM_BUILD_ROOT 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) %defattr(-,root,root)
%dir %{_sysconfdir}/ghostscript %dir %{_sysconfdir}/ghostscript
%dir %{_sysconfdir}/ghostscript/%{gs_dot_ver} %dir %{_sysconfdir}/ghostscript/%{gs_dot_ver}
@ -293,9 +311,13 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so.* %{_libdir}/libgs.so.*
%{_libdir}/libijs-*.so* %{_libdir}/libijs-*.so*
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%{_libdir}/%{name}/%{gs_dot_ver} %dir %{_libdir}/%{name}/%{gs_dot_ver}
%config(noreplace) %{_sysconfdir}/ghostscript/%{gs_dot_ver}/* %config(noreplace) %{_sysconfdir}/ghostscript/%{gs_dot_ver}/*
%files
%defattr(-,root,root)
%{_libdir}/%{name}/%{gs_dot_ver}/X11.so
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_datadir}/ghostscript/%{gs_dot_ver}/examples %doc %{_datadir}/ghostscript/%{gs_dot_ver}/examples
@ -305,6 +327,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/gsx %{_bindir}/gsx
%files x11
%defattr(-,root,root)
%{_libdir}/%{name}/%{gs_dot_ver}/X11.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_includedir}/ghostscript %dir %{_includedir}/ghostscript
@ -317,6 +343,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Thu Dec 18 2014 Tim Waugh <twaugh@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@redhat.com> 9.15-3 * Tue Oct 7 2014 Tim Waugh <twaugh@redhat.com> 9.15-3
- Avoid shipping ramfs source as its license is unclear. Similarly - Avoid shipping ramfs source as its license is unclear. Similarly
with some documentation and example code (bug #1149617). with some documentation and example code (bug #1149617).