[nx-libs] Do not build/ship unneeded xlib18n libs

Orion Poplawski orion at fedoraproject.org
Thu Oct 10 22:55:59 UTC 2013


commit 64cb253ecdc8ae08384bbca6b2da5ad2dec0f5fa
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu Oct 10 16:55:56 2013 -0600

    Do not build/ship unneeded xlib18n libs

 nx-libs-bundled.patch |    3 ++-
 nx-libs.spec          |   17 ++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/nx-libs-bundled.patch b/nx-libs-bundled.patch
index 05ae130..8e6c5e8 100644
--- a/nx-libs-bundled.patch
+++ b/nx-libs-bundled.patch
@@ -10,7 +10,7 @@ diff -up nx-libs-3.5.0.21/nx-X11/config/cf/host.def.bundled nx-libs-3.5.0.21/nx-
  
  #else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
  
-@@ -1023,3 +1023,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
+@@ -1023,3 +1023,8 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
  
  #define BuildRman NO
  #define BuildFontEncLib NO
@@ -18,6 +18,7 @@ diff -up nx-libs-3.5.0.21/nx-X11/config/cf/host.def.bundled nx-libs-3.5.0.21/nx-
 +#define BuildXftLibrary NO
 +#define BuildXft1Library NO
 +#define SharedLibFont NO
++#define BuildLoadableXlibI18n NO
 diff -up nx-libs-3.5.0.21/nx-X11/lib/Imakefile.bundled nx-libs-3.5.0.21/nx-X11/lib/Imakefile
 --- nx-libs-3.5.0.21/nx-X11/lib/Imakefile.bundled	2013-08-30 08:18:40.000000000 -0600
 +++ nx-libs-3.5.0.21/nx-X11/lib/Imakefile	2013-08-30 20:42:40.344850909 -0600
diff --git a/nx-libs.spec b/nx-libs.spec
index bab937a..6e034a8 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -2,7 +2,7 @@
 
 Name:           nx-libs
 Version:        3.5.0.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NX X11 protocol compression libraries
 
 Group:          System Environment/Libraries
@@ -591,12 +591,6 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
 
 %files -n libNX_X11
 %{_libdir}/nx/X11/libNX_X11.so.6*
-%{_libdir}/nx/X11/libximcp.so.2
-%{_libdir}/nx/X11/libxlcDef.so.2
-%{_libdir}/nx/X11/libxlcUTF8Load.so.2
-%{_libdir}/nx/X11/libxlibi18n.so.2
-%{_libdir}/nx/X11/libxlocale.so.2
-%{_libdir}/nx/X11/libxomGeneric.so.2
 
 %files -n libNX_X11-devel
 %{_libdir}/nx/X11/libNX_X11.so
@@ -613,12 +607,6 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
 %{_includedir}/nx/X11/Xresource.h
 %{_includedir}/nx/X11/Xutil.h
 %{_includedir}/nx/X11/cursorfont.h
-%{_libdir}/nx/X11/libximcp.so
-%{_libdir}/nx/X11/libxlcDef.so
-%{_libdir}/nx/X11/libxlcUTF8Load.so
-%{_libdir}/nx/X11/libxlibi18n.so
-%{_libdir}/nx/X11/libxlocale.so
-%{_libdir}/nx/X11/libxomGeneric.so
 
 %files -n libNX_Xau-devel
 %{_libdir}/nx/X11/libNX_Xau.so
@@ -885,6 +873,9 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
 
 
 %changelog
+* Thu Oct 10 2013 Orion Poplawski <orion at cora.nwra.com> - 3.5.0.21-4
+- Do not build/ship unneeded xlib18n libs
+
 * Wed Sep 4 2013 Orion Poplawski <orion at cora.nwra.com> - 3.5.0.21-3
 - Fix nx obsoletes version
 


More information about the scm-commits mailing list