This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 10d670c Support .symbols for 64bit and 32bit alike. new 7e0de4d nx-libs.spec: Mention NX technology in every package description. new 9a901a9 Makefile.nx-libs: Install man pages via main Makefile. new 76c5291 nx-libs.spec: Install man pages into bin:packages. new a161173 Make libNX_X11-6 and libXinerama1 compliant to Shared Library Policy. new 5e85638 nx-libs.spec: several dependency fixes... The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/Makefile.nx-libs | 12 +++ debian/changelog | 7 ++ debian/nxagent.install | 1 + debian/nxagent.manpages | 1 - debian/nxauth.install | 1 + debian/nxauth.manpages | 2 - debian/nxproxy.install | 2 +- debian/nxproxy.manpages | 1 - debian/x2goagent.install | 1 + debian/x2goagent.manpages | 1 - nx-libs.spec | 210 +++++++++++++++++++++++++++++++++++---------- 11 files changed, 189 insertions(+), 50 deletions(-) delete mode 100644 debian/nxagent.manpages delete mode 100644 debian/nxauth.manpages delete mode 100644 debian/nxproxy.manpages delete mode 100644 debian/x2goagent.manpages -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 7e0de4df1a6a2ee07c1dcfc34fff77bc2196d676 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 29 11:46:31 2015 +0100 nx-libs.spec: Mention NX technology in every package description. --- debian/changelog | 1 + nx-libs.spec | 133 ++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 119 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 796b1bd..85fbb37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium + Update .spec file to meet changes in tarball size reduction and restructuring. + Use SONAME based library package naming scheme. + + Mention NX technology in every package description. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, diff --git a/nx-libs.spec b/nx-libs.spec index 0c320a9..8519ef3 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -81,9 +81,6 @@ NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. -This package provides the core nx-X11 libraries customized for -nxagent/x2goagent. - %package -n libNX_X11-6 Group: System Environment/Libraries @@ -94,6 +91,10 @@ Requires: xorg-x11-fonts-core %endif %description -n libNX_X11-6 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The X Window System is a network-transparent window system that was designed at MIT. X display servers run on computers with either monochrome or color bitmap display hardware. The server distributes @@ -111,6 +112,10 @@ Requires: libNX_X11-6%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} %description -n libNX_X11-devel +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The X Window System is a network-transparent window system that was designed at MIT. X display servers run on computers with either monochrome or color bitmap display hardware. The server distributes @@ -131,11 +136,15 @@ Requires: libNX_Xau6%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} %description -n libNX_Xau-devel -libXau provides mechanisms for individual access to an X Window +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + +libNX_Xau provides mechanisms for individual access to an nx-X11 Window System display. It uses existing core protocol and library hooks for -specifying authorization data in the connection setup block to -restrict use of the display to only those clients that show that they -know a server-specific key called a "magic cookie". +specifying authorization data in the connection setup block to restrict +use of the display to only those clients that show that they know a +server-specific key called a "magic cookie". This package contains all necessary include files and libraries needed to develop applications that require these. @@ -147,7 +156,11 @@ Summary: NX authorization protocol library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xau6 -libXau provides mechanisms for individual access to an X Window +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + +libNX_Xau provides mechanisms for individual access to an X Window System display. It uses existing core protocol and library hooks for specifying authorization data in the connection setup block to restrict use of the display to only those clients that show that they @@ -160,6 +173,10 @@ Summary: NX protocol Composite extension client library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xcomposite1 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The Composite extension causes a entire sub-tree of the window hierarchy to be rendered to an off-screen buffer. Applications can then take the contents of that buffer and do whatever they like. The @@ -173,6 +190,10 @@ Summary: NX Damage Extension library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xdamage1 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The X Damage Extension allows applications to track modified regions of drawables. @@ -185,6 +206,10 @@ Requires: libNX_Xdmcp6%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} %description -n libNX_Xdmcp-devel +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The X Display Manager Control Protocol (XDMCP) provides a uniform mechanism for an autonomous display to request login service from a remote host. By autonomous, we mean the display consists of hardware @@ -203,6 +228,10 @@ Summary: NX Display Manager Control Protocol library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xdmcp6 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The X Display Manager Control Protocol (XDMCP) provides a uniform mechanism for an autonomous display to request login service from a remote host. By autonomous, we mean the display consists of hardware @@ -220,7 +249,11 @@ Requires: libNX_Xau6-devel%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} %description -n libNX_Xext-devel -The Xext library contains a handful of X11 extensions: +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + +The NX_Xext library contains a handful of X11 extensions: - Double Buffer extension (DBE/Xdbe) - Display Power Management Signaling (DPMS) extension - X11 Nonrectangular Window Shape extension (Xshape) @@ -239,7 +272,11 @@ Summary: Common extensions to the NX protocol Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xext6 -The Xext library contains a handful of X11 extensions: +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + +The NX_Xext library contains a handful of X11 extensions: - Double Buffer extension (DBE/Xdbe) - Display Power Management Signaling (DPMS) extension - X11 Nonrectangular Window Shape extension (Xshape) @@ -257,7 +294,11 @@ Requires: libNX_X11-devel%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} %description -n libNX_Xfixes-devel -The X Fixes extension provides applications with work-arounds for +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + +The nx-X11 Fixes extension provides applications with work-arounds for various limitations in the core protocol. This package contains all necessary include files and libraries @@ -270,7 +311,11 @@ Summary: NX miscellaneous "fixes" extension library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xfixes3 -The X Fixes extension provides applications with work-arounds for +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + +The nx_X11 Fixes extension provides applications with work-arounds for various limitations in the core protocol. @@ -287,6 +332,10 @@ Requires: libXext%{?_isa} %endif %description -n libNX_Xinerama1 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + Xinerama is an extension to the X Window System which enables multi-headed X applications and window managers to use two or more physical displays as one large virtual display. @@ -298,6 +347,10 @@ Summary: Development files for the NX Pixmap image file format library Requires: libNX_Xpm4%{?_isa} = %{version}-%{release} %description -n libNX_Xpm-devel +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + libXpm facilitates working with XPM (X PixMap), a format for storing/retrieving X pixmaps to/from files. @@ -311,7 +364,11 @@ Summary: NX Pixmap image file format library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xpm4 -libXpm facilitates working with XPM (X PixMap), a format for +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + +libNX_Xpm facilitates working with XPM (X PixMap), a format for storing/retrieving X pixmaps to/from files. @@ -321,6 +378,10 @@ Summary: NX Resize, Rotate and Reflection extension library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xrandr2 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The X Resize, Rotate and Reflect Extension (RandR) allows clients to dynamically change X screens, so as to resize, to change the orientation and layout of the root window of a screen. @@ -334,6 +395,10 @@ Requires: libNX_X11-devel%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} %description -n libNX_Xrender-devel +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The Xrender library is designed as a lightweight library interface to the Render extension. @@ -347,6 +412,10 @@ Summary: NX Rendering Extension library Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xrender1 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The Xrender library is designed as a lightweight library interface to the Render extension. @@ -357,6 +426,10 @@ Summary: Xlib-based client API for the XTEST and RECORD extensions on NX Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libNX_Xtst6 +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The XTEST extension is a minimal set of client and server extensions required to completely test the X11 server with no user intervention. This extension is not intended to support general journaling and @@ -373,6 +446,10 @@ Requires: libXcomp3%{?_isa} = %{version}-%{release} Requires: nx-proto-devel = %{version}-%{release} %description -n libXcomp-devel +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + The NX differential compression library's development files. @@ -397,6 +474,10 @@ Requires: libNX_X11-devel%{?_isa} = %{version}-%{release} Requires: nx-proto-devel%{?_isa} = %{version}-%{release} %description -n libXcompext-devel +NX is a software suite from NoMachine which implements very efficient +compression of the X11 protocol. This increases performance when +using X applications over a network, especially a slow one. + The NX compression extensions library's development files. @@ -424,6 +505,10 @@ Requires: nx-proto-devel%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description -n libXcompshad-devel +NX is a software suite from NoMachine which implements very efficient +compression of the X11 protocol. This increases performance when +using X applications over a network, especially a slow one. + The NX session shadowing library's development files. @@ -454,8 +539,12 @@ Requires: nx-proto-devel%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel +NX is a software suite from NoMachine which implements very efficient +compression of the X11 protocol. This increases performance when +using X applications over a network, especially a slow one. + This package contains all necessary include files and libraries -needed to develop X11 applications that require these. +needed to develop nx-X11 applications that require these. %package -n nx-proto-devel @@ -463,8 +552,12 @@ Group: Development/Libraries Summary: Include files for NX development %description -n nx-proto-devel +NX is a software suite from NoMachine which implements very efficient +compression of the X11 protocol. This increases performance when +using X applications over a network, especially a slow one. + This package contains all necessary include files and libraries -needed to develop X11 applications that require these. +for the nx_X11 wire protocol. %package -n nxagent @@ -504,6 +597,10 @@ Group: Applications/System Summary: NX Auth %description -n nxauth +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + This package provides the NX xauth binary. @@ -516,6 +613,10 @@ Obsoletes: nx%{?_isa} < 3.5.0-19 Provides: nx%{?_isa} = %{version}-%{release} %description -n nxproxy +NX is a software suite which implements very efficient compression of +the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. + This package provides the NX proxy (client) binary. @@ -1019,3 +1120,5 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %changelog +* Thu Jan 29 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 3.5.0.29 +- See debian/changelog for details. \ No newline at end of file -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 9a901a9f6a31d7fb47199f48051056d6a07e26e8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 29 11:49:28 2015 +0100 Makefile.nx-libs: Install man pages via main Makefile. --- debian/Makefile.nx-libs | 12 ++++++++++++ debian/changelog | 1 + debian/nxagent.install | 1 + debian/nxagent.manpages | 1 - debian/nxauth.install | 1 + debian/nxauth.manpages | 2 -- debian/nxproxy.install | 2 +- debian/nxproxy.manpages | 1 - debian/x2goagent.install | 1 + debian/x2goagent.manpages | 1 - 10 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index cd0a4e9..a60dc7b 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -65,6 +65,11 @@ install-lite: for d in nxcomp nxproxy; do \ $(MAKE) -C $$d install; done + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ + $(INSTALL_FILE) nxproxy/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/ + gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 + + install-full: for f in nxagent nxauth x2goagent; do \ $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done @@ -88,6 +93,13 @@ install-full: $(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin $(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ + $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/ + $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/ + $(INSTALL_FILE) nx-X11/programs/nxauth/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/ + mv -f $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.1 + gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 + # create a clean nx-X11/.build-exports space rm -Rf nx-X11/.build-exports mkdir -p nx-X11/.build-exports/include diff --git a/debian/changelog b/debian/changelog index 85fbb37..9394021 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch. Fix several typos in upstream code detected by lintian. * Makefile.nx-libs: Don't allow symlinks to point into buildroot. + * Makefile.nx-libs: Install man pages via main Makefile. * Add Description: and Author: fields to various patch headers. * NX code reduction efforts (from 93Mb to 41Mb): diff --git a/debian/nxagent.install b/debian/nxagent.install index 4556ee7..eaaa847 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -1,6 +1,7 @@ etc/nxagent/keystrokes.cfg etc/nxagent/rgb usr/share/nx/rgb +usr/share/man/man1/nxagent.1* usr/lib/nx/bin/nxagent usr/bin/nxagent usr/share/pixmaps/nxagent.xpm diff --git a/debian/nxagent.manpages b/debian/nxagent.manpages deleted file mode 100644 index 681002a..0000000 --- a/debian/nxagent.manpages +++ /dev/null @@ -1 +0,0 @@ -nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 diff --git a/debian/nxauth.install b/debian/nxauth.install index 9c5db00..eefba46 100644 --- a/debian/nxauth.install +++ b/debian/nxauth.install @@ -1,2 +1,3 @@ usr/lib/nx/bin/nxauth usr/bin/nxauth +usr/share/man/man1/nxauth.1* diff --git a/debian/nxauth.manpages b/debian/nxauth.manpages deleted file mode 100644 index 71592e6..0000000 --- a/debian/nxauth.manpages +++ /dev/null @@ -1,2 +0,0 @@ -nx-X11/programs/nxauth/nxauth.man - diff --git a/debian/nxproxy.install b/debian/nxproxy.install index c7f7589..5a55a98 100644 --- a/debian/nxproxy.install +++ b/debian/nxproxy.install @@ -1,3 +1,3 @@ usr/lib/nx/bin/nxproxy usr/bin/nxproxy -usr/share/man/man1/nxproxy.1 +usr/share/man/man1/nxproxy.1* diff --git a/debian/nxproxy.manpages b/debian/nxproxy.manpages deleted file mode 100644 index 8564de8..0000000 --- a/debian/nxproxy.manpages +++ /dev/null @@ -1 +0,0 @@ -nxproxy/man/nxproxy.1 diff --git a/debian/x2goagent.install b/debian/x2goagent.install index ad6b1d8..9ef17d9 100644 --- a/debian/x2goagent.install +++ b/debian/x2goagent.install @@ -2,6 +2,7 @@ usr/bin/x2goagent usr/lib/x2go/bin/x2goagent usr/share/pixmaps/x2go.xpm usr/share/x2go/rgb +usr/share/man/man1/x2goagent.1* etc/x2go/rgb usr/share/x2go/versions/VERSION.x2goagent etc/x2go/keystrokes.cfg diff --git a/debian/x2goagent.manpages b/debian/x2goagent.manpages deleted file mode 100644 index 2a8850e..0000000 --- a/debian/x2goagent.manpages +++ /dev/null @@ -1 +0,0 @@ -nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 76c529124872bd9f162ce31f0a31b1280eca3795 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 29 11:49:37 2015 +0100 nx-libs.spec: Install man pages into bin:packages. --- debian/changelog | 1 + nx-libs.spec | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9394021..e8ca95e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium restructuring. + Use SONAME based library package naming scheme. + Mention NX technology in every package description. + + Install man pages into bin:packages. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, diff --git a/nx-libs.spec b/nx-libs.spec index 8519ef3..127dcf6 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1092,17 +1092,20 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %{_libdir}/nx/bin/nxagent %{_datadir}/pixmaps/nxagent.xpm %{_datadir}/nx/rgb +%{_datadir}/man/man1/nxagent.1* %files -n nxauth %defattr(-,root,root) %{_bindir}/nxauth %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxauth +%{_datadir}/man/man1/nxauth.1* %files -n nxproxy %defattr(-,root,root) %{_bindir}/nxproxy %{_mandir}/man1/nxproxy.1* +%{_datadir}/man/man1/nxproxy.1* %files -n x2goagent %defattr(-,root,root) @@ -1117,6 +1120,7 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %{_libdir}/x2go/bin/x2goagent %{_datadir}/pixmaps/x2go.xpm %{_datadir}/x2go/ +%{_datadir}/man/man1/x2goagent.1* %changelog -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit a161173d1ab27e7956cf26683e16ae3c37e3bbe0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 29 11:53:16 2015 +0100 Make libNX_X11-6 and libXinerama1 compliant to Shared Library Policy. --- debian/changelog | 1 + nx-libs.spec | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8ca95e..bd71ec4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,6 +79,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium + Use SONAME based library package naming scheme. + Mention NX technology in every package description. + Install man pages into bin:packages. + + Make libNX_X11-6 and libXinerama1 compliant to Shared Library Policy. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, diff --git a/nx-libs.spec b/nx-libs.spec index 127dcf6..1ecf349 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -787,13 +787,17 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files %defattr(-,root,root) %doc nx-X11/{COPYING,LICENSE,README} +%dir %{_libdir}/nx +%dir %{_libdir}/nx/X11 %dir %{_datadir}/nx %{_datadir}/nx/SecurityPolicy +%dir %{_libdir}/nx/X11/Xinerama/ +%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 +%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 +%{_libdir}/nx/X11/Xinerama/libXinerama.so.1* %files -n libNX_X11-6 %defattr(-,root,root) -%dir %{_libdir}/nx -%dir %{_libdir}/nx/X11 %{_libdir}/libNX_X11.so.6* %files -n libNX_X11-devel @@ -886,10 +890,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %files -n libNX_Xinerama1 %defattr(-,root,root) %{_libdir}/libNX_Xinerama.so.1* -%dir %{_libdir}/nx/X11/Xinerama/ -%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 -%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 -%{_libdir}/nx/X11/Xinerama/libXinerama.so.1* %files -n libNX_Xpm-devel %defattr(-,root,root) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 5e85638762f47ac7a6e1e7b81222881247b5eac9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 29 12:05:23 2015 +0100 nx-libs.spec: several dependency fixes... + Add Obsoletes: fields to all shared libs for marking the non-versioned library package (names) as obsolete. + Don't depend on nx-libs base package with fixed version. --- debian/changelog | 3 +++ nx-libs.spec | 61 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd71ec4..61fe48f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,9 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium + Mention NX technology in every package description. + Install man pages into bin:packages. + Make libNX_X11-6 and libXinerama1 compliant to Shared Library Policy. + + Add Obsoletes: fields to all shared libs for marking the non-versioned + library package (names) as obsolete. + + Don't depend on nx-libs base package with fixed version. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, diff --git a/nx-libs.spec b/nx-libs.spec index 1ecf349..a143050 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -71,6 +71,15 @@ Provides: nx = %{version}-%{release} Obsoletes: nx%{?_isa} < 3.5.0-19 Provides: nx%{?_isa} = %{version}-%{release} +# for Xinerama in NX to work: +%if 0%{?suse_version} +Requires: libX11-6%{?_isa} +Requires: libXext6%{?_isa} +%else +Requires: libX11%{?_isa} +Requires: libXext%{?_isa} +%endif + %if 0%{?el5} # For compatibility with EPEL5 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -85,7 +94,8 @@ applications over a network, especially a slow one. %package -n libNX_X11-6 Group: System Environment/Libraries Summary: Core NX protocol client library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_X11 %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif @@ -153,7 +163,8 @@ needed to develop applications that require these. %package -n libNX_Xau6 Group: System Environment/Libraries Summary: NX authorization protocol library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xau %description -n libNX_Xau6 NX is a software suite which implements very efficient compression of @@ -170,7 +181,8 @@ know a server-specific key called a "magic cookie". %package -n libNX_Xcomposite1 Group: System Environment/Libraries Summary: NX protocol Composite extension client library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xcomposite %description -n libNX_Xcomposite1 NX is a software suite which implements very efficient compression of @@ -187,7 +199,8 @@ or merged by external programs, called compositing managers. %package -n libNX_Xdamage1 Group: System Environment/Libraries Summary: NX Damage Extension library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xdamage %description -n libNX_Xdamage1 NX is a software suite which implements very efficient compression of @@ -225,7 +238,8 @@ needed to develop applications that require these. %package -n libNX_Xdmcp6 Group: System Environment/Libraries Summary: NX Display Manager Control Protocol library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xdmcp %description -n libNX_Xdmcp6 NX is a software suite which implements very efficient compression of @@ -269,7 +283,8 @@ needed to develop applications that require these. %package -n libNX_Xext6 Group: System Environment/Libraries Summary: Common extensions to the NX protocol -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xext %description -n libNX_Xext6 NX is a software suite which implements very efficient compression of @@ -308,7 +323,7 @@ needed to develop applications that require these. %package -n libNX_Xfixes3 Group: System Environment/Libraries Summary: NX miscellaneous "fixes" extension library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 %description -n libNX_Xfixes3 NX is a software suite which implements very efficient compression of @@ -322,14 +337,8 @@ various limitations in the core protocol. %package -n libNX_Xinerama1 Group: System Environment/Libraries Summary: Xinerama extension to the NX Protocol -Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?suse_version} -Requires: libX11-6%{?_isa} -Requires: libXext6%{?_isa} -%else -Requires: libX11%{?_isa} -Requires: libXext%{?_isa} -%endif +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xinerama %description -n libNX_Xinerama1 NX is a software suite which implements very efficient compression of @@ -361,7 +370,8 @@ needed to develop applications that require these. %package -n libNX_Xpm4 Group: System Environment/Libraries Summary: NX Pixmap image file format library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xpm %description -n libNX_Xpm4 NX is a software suite which implements very efficient compression of @@ -375,7 +385,8 @@ storing/retrieving X pixmaps to/from files. %package -n libNX_Xrandr2 Group: System Environment/Libraries Summary: NX Resize, Rotate and Reflection extension library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xrandr %description -n libNX_Xrandr2 NX is a software suite which implements very efficient compression of @@ -409,7 +420,8 @@ needed to develop applications that require these. %package -n libNX_Xrender1 Group: System Environment/Libraries Summary: NX Rendering Extension library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xrender %description -n libNX_Xrender1 NX is a software suite which implements very efficient compression of @@ -423,7 +435,8 @@ the Render extension. %package -n libNX_Xtst6 Group: System Environment/Libraries Summary: Xlib-based client API for the XTEST and RECORD extensions on NX -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xtst %description -n libNX_Xtst6 NX is a software suite which implements very efficient compression of @@ -456,7 +469,8 @@ The NX differential compression library's development files. %package -n libXcomp3 Group: System Environment/Libraries Summary: NX differential compression library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xcomp %description -n libXcomp3 NX is a software suite from NoMachine which implements very efficient @@ -484,7 +498,8 @@ The NX compression extensions library's development files. %package -n libXcompext3 Group: System Environment/Libraries Summary: NX protocol compression extensions library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xcompext %description -n libXcompext3 NX is a software suite from NoMachine which implements very efficient @@ -515,7 +530,8 @@ The NX session shadowing library's development files. %package -n libXcompshad3 Group: System Environment/Libraries Summary: NX session shadowing Library -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} >= 3.5.0.29 +Obsoletes: libNX_Xcompshad %description -n libXcompshad3 NX is a software suite from NoMachine which implements very efficient @@ -570,7 +586,6 @@ Provides: nx%{?_isa} = %{version}-%{release} %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif -Requires: libNX_Xinerama1%{?_isa} = %{version}-%{release} %description -n nxagent NX is a software suite which implements very efficient compression of -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git