From 3d8b197234f1a5ecedcccb2e06db3362f5be76b7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jan 06 2014 03:49:07 +0000 Subject: - Update to 3.5.0.22 - Drop bundled patch applied upstream - Fix Xinerama support --- diff --git a/.gitignore b/.gitignore index 9b46e7c..7487a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /nx-libs-3.5.0.21-full.tar.gz +/nx-libs-3.5.0.22-full.tar.gz diff --git a/nx-libs-bundled.patch b/nx-libs-bundled.patch deleted file mode 100644 index 8e6c5e8..0000000 --- a/nx-libs-bundled.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up nx-libs-3.5.0.21/nx-X11/config/cf/host.def.bundled nx-libs-3.5.0.21/nx-X11/config/cf/host.def ---- nx-libs-3.5.0.21/nx-X11/config/cf/host.def.bundled 2013-08-30 13:23:26.000000000 -0600 -+++ nx-libs-3.5.0.21/nx-X11/config/cf/host.def 2013-08-30 20:44:19.647460161 -0600 -@@ -962,7 +962,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de - - #define SharedLibXdmcp YES - --#define BuildXaw7 YES -+#define BuildXaw7 NO - - #else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ - -@@ -1023,3 +1023,8 @@ XCOMM $XFree86: xc/config/cf/xf86site.de - - #define BuildRman NO - #define BuildFontEncLib NO -+#define BuildXcursorLibrary NO -+#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 -@@ -213,14 +213,8 @@ XEXTLIBDIR = Xext - - #if BuildLibraries - OLDXLIBDIR = oldX --ICELIBDIR = ICE --SMLIBDIR = SM --XTLIBDIR = Xt --XMULIBDIR = Xmu --XMUULIBDIR = Xmuu - XPMLIBDIR = Xpm - XTSTLIBDIR = Xtst --FSLIBDIR = FS - #endif - - diff --git a/nx-libs.spec b/nx-libs.spec index 05bd106..1df0345 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: nx-libs -Version: 3.5.0.21 -Release: 5%{?dist} +Version: 3.5.0.22 +Release: 1%{?dist} Summary: NX X11 protocol compression libraries Group: System Environment/Libraries @@ -14,8 +14,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}- # debian/roll-tarballs.sh HEAD server # mv _releases_/source/nx-libs/nx-libs-HEAD-full.tar.gz . #Source0: ns-libs-HEAD-full.tar.gz -# Remove bundled libraries -Patch0: nx-libs-bundled.patch BuildRequires: autoconf BuildRequires: expat-devel @@ -231,6 +229,8 @@ various limitations in the core protocol. Group: System Environment/Libraries Summary: Xinerama extension to the NX Protocol Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libX11%{?_isa} +Requires: libXext%{?_isa} %description -n libNX_Xinerama Xinerama is an extension to the X Window System which enables @@ -481,7 +481,6 @@ information on NX. %prep %setup -q -%patch0 -p1 -b .bundled # Install into /usr sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def # Use rpm optflags @@ -506,7 +505,6 @@ find -type f -name '*.[hc]' | xargs chmod -x # Xcursor - Other code still references files in it # Xfont - Statically linked to nxarget, others? # Xpm -rm -r nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu} %build @@ -546,6 +544,10 @@ echo %{_libdir}/nx/X11 >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arc mkdir -p %{buildroot}%{_datadir}/X11/xkb touch %{buildroot}%{_datadir}/X11/xkb/keymap.dir +# Need for Xinerama support +ln -s -f ../../../../%{_lib}/libX11.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 +ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 + # Remove extras, GL, and other unneeded headers rm -r %{buildroot}%{_includedir}/nx/{extras,GL} rm -r %{buildroot}%{_includedir}/nx/X11/bitmaps @@ -676,6 +678,7 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans %files -n libNX_Xinerama %{_libdir}/nx/X11/libNX_Xinerama.so.1* +%{_libdir}/nx/X11/Xinerama/ %files -n libNX_Xpm-devel %{_libdir}/nx/X11/libNX_Xpm.so @@ -880,6 +883,11 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans %changelog +* Sun Jan 5 2014 Orion Poplawski - 3.5.0.22-1 +- Update to 3.5.0.22 +- Drop bundled patch applied upstream +- Fix Xinerama support + * Fri Jan 3 2014 Orion Poplawski - 3.5.0.21-5 - Provide /usr/share/X11/xkb/keymap.dir so nxagent can find keymap dir (bug #1033876) diff --git a/sources b/sources index be88de1..743691f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7143c216cb6eda0408ee8169c50adbe3 nx-libs-3.5.0.21-full.tar.gz +739c7a28f3bb6d5f957e6cec9168335d nx-libs-3.5.0.22-full.tar.gz