aboutsummaryrefslogtreecommitdiff
path: root/nx-libs.spec
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-22 08:38:21 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-22 08:38:21 +0200
commitb964406ba6e7e2d65b88010856ce881ee928898a (patch)
tree2c37d81d17f33bf288c3a44adc11bc328ee8e697 /nx-libs.spec
parenta77ca871c6c1b0d6d866f95e4eb6e013f92e9627 (diff)
parent70b77a0fc329e2e205a596a738c7307d354e7b1c (diff)
downloadnx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.gz
nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.bz2
nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.zip
Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x
Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14
Diffstat (limited to 'nx-libs.spec')
-rw-r--r--nx-libs.spec33
1 files changed, 3 insertions, 30 deletions
diff --git a/nx-libs.spec b/nx-libs.spec
index 2e6c5da4c..3e38173c3 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -27,35 +27,29 @@ BuildRequires: gpg-offline
BuildRequires: fdupes
%if 0%{?suse_version} >= 1130
BuildRequires: pkgconfig(expat)
-BuildRequires: pkgconfig(fontconfig)
-BuildRequires: pkgconfig(fontenc)
-BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(xfont)
%else
BuildRequires: libexpat-devel
-BuildRequires: fontconfig-devel
-BuildRequires: freetype2-devel
BuildRequires: libpng-devel
BuildRequires: libxml2-devel
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
-BuildRequires: xorg-x11-libfontenc-devel
BuildRequires: xorg-x11-libXpm-devel
+BuildRequires: xorg-x11-libXfont-devel
%endif
BuildRequires: xorg-x11-util-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: expat-devel
-BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
-BuildRequires: libfontenc-devel
BuildRequires: libpng-devel
BuildRequires: libxml2-devel
+BuildRequires: libXfont-devel
%endif
# For imake
@@ -680,7 +674,6 @@ find -type f -name '*.[hc]' | xargs chmod -x
# Mesa - Used by the X server
# Xcursor - Other code still references files in it
-# Xfont - Statically linked to nxarget, others?
# Xpm
@@ -962,20 +955,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/record.h
%{_includedir}/nx/X11/extensions/xf86dga1.h
%{_includedir}/nx/X11/extensions/xf86vmode.h
-%dir %{_includedir}/nx/X11/fonts
-%{_includedir}/nx/X11/fonts/bdfint.h
-%{_includedir}/nx/X11/fonts/bitmap.h
-%{_includedir}/nx/X11/fonts/bufio.h
-%{_includedir}/nx/X11/fonts/fntfil.h
-%{_includedir}/nx/X11/fonts/fntfilio.h
-%{_includedir}/nx/X11/fonts/fntfilst.h
-%{_includedir}/nx/X11/fonts/fontencc.h
-%{_includedir}/nx/X11/fonts/fontmisc.h
-%{_includedir}/nx/X11/fonts/fontmod.h
-%{_includedir}/nx/X11/fonts/fontshow.h
-%{_includedir}/nx/X11/fonts/fontutil.h
-%{_includedir}/nx/X11/fonts/fontxlfd.h
-%{_includedir}/nx/X11/fonts/pcf.h
%{_includedir}/nx/X11/misc.h
%{_includedir}/nx/X11/os.h
@@ -1041,12 +1020,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/xtraplib.h
%{_includedir}/nx/X11/extensions/xtraplibp.h
%{_includedir}/nx/X11/extensions/xtrapproto.h
-%dir %{_includedir}/nx/X11/fonts
-%{_includedir}/nx/X11/fonts/FS.h
-%{_includedir}/nx/X11/fonts/FSproto.h
-%{_includedir}/nx/X11/fonts/font.h
-%{_includedir}/nx/X11/fonts/fontstruct.h
-%{_includedir}/nx/X11/fonts/fsmasks.h
%files -n nxagent
%defattr(-,root,root)