rpms/freenx-server/F-11 freenx-server-r104-fixes.patch, 1.1, 1.2 freenx-server.spec, 1.9, 1.10
athimm
athimm at fedoraproject.org
Mon Nov 23 11:38:37 UTC 2009
Author: athimm
Update of /cvs/extras/rpms/freenx-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18146/F-11
Modified Files:
freenx-server-r104-fixes.patch freenx-server.spec
Log Message:
Rebase to launchbpad codebase, also fix #540189, #539308, #523660, #515554
freenx-server-r104-fixes.patch:
init.d/freenx-server | 123 +++++++++++++++++++++++++++++++++++----------------
nxloadconfig | 30 ++++++++++--
nxnode | 110 ++++++++++++++++++++++++++++++++++++++++++---
nxprint | 3 -
nxredir/Makefile | 3 -
nxredir/nxsmb | 5 ++
nxserver | 18 +++++++
7 files changed, 240 insertions(+), 52 deletions(-)
Index: freenx-server-r104-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/freenx-server/F-11/freenx-server-r104-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freenx-server-r104-fixes.patch 23 Nov 2009 11:13:02 -0000 1.1
+++ freenx-server-r104-fixes.patch 23 Nov 2009 11:38:36 -0000 1.2
@@ -415,6 +415,24 @@ diff -rud -x .bzr freenx-server/nxprint
awk -F '"' '/\*Manufacturer:/ { a[FILENAME]=$2 }
/\*NickName:/ { b[FILENAME]=$2 }
END {
+diff -rud -x .bzr freenx-server/nxredir/Makefile freenx-server.fixes/nxredir/Makefile
+--- freenx-server/nxredir/Makefile 2009-11-23 10:16:13.100350348 +0100
++++ freenx-server.fixes/nxredir/Makefile 2009-11-23 11:57:13.481350660 +0100
+@@ -9,13 +9,12 @@
+ $(CC) -fPIC $(CFLAGS) -nostdlib -shared -Wl,-soname,$(LIBNAME).$(VERSION) -o $(LIBNAME).$(VERSION) nxredir.o -ldl -lc
+
+ clean:
+- rm -f $(LIBNAME)
+ rm -f $(LIBNAME).$(VERSION)
+ rm -f *.o
+
+ ifneq ($(NX_VERSION),)
+ install: all
+- install -m755 $(LIBNAME) $(DESTDIR)/$$PATH_LIB/
++ install -m755 $(LIBNAME).$(VERSION) $(DESTDIR)/$$PATH_LIB/
+ install -m755 nxredir $(DESTDIR)/$$PATH_BIN/
+ install -m755 nxsmb $(DESTDIR)/$$CUPS_BACKEND/
+ perl -pi -e "s,PATH_LIB=.*,PATH_LIB=\"$$PATH_LIB\",g" $(DESTDIR)/$$PATH_BIN/nxredir
diff -rud -x .bzr freenx-server/nxredir/nxsmb freenx-server.fixes/nxredir/nxsmb
--- freenx-server/nxredir/nxsmb 2009-11-23 10:16:13.098350105 +0100
+++ freenx-server.fixes/nxredir/nxsmb 2009-11-23 10:52:01.354352855 +0100
Index: freenx-server.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx-server/F-11/freenx-server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- freenx-server.spec 31 Jul 2009 19:19:29 -0000 1.9
+++ freenx-server.spec 23 Nov 2009 11:38:36 -0000 1.10
@@ -7,13 +7,14 @@
Summary: Free Software (GPL) Implementation of the NX Server
Name: freenx-server
Version: 0.7.3
-Release: 15%{?dist}
+Release: 16%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://freenx.berlios.de/
Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
Source1: freenx.logrotate
-Patch0: freenx-server-0.7.3-fixes.patch
+Patch0: freenx-server-0.7.3-lp-fixes.patch
+Patch1: freenx-server-r104-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: imake, redhat-release
Requires: nx, %{_pkglibdir}
@@ -37,7 +38,8 @@ under the GPL. FreeNX-server is a GPL im
%prep
%setup -q
-%patch0 -p1 -b .fixes
+%patch0 -p1 -b .lp
+%patch1 -p1 -b .fixes
sed -i -e's,\$NX_DIR/bin,%{_pkglibexecdir},g'\
-e's,\$NX_DIR/lib,%{_pkglibdir},g'\
@@ -121,7 +123,12 @@ fi
%{_sysconfdir}/init.d/freenx-server
%changelog
-* Fri Jul 31 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-15
+* Mon Nov 23 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-16
+- Rebase to launchpad development bzr code.
+- Add status to init file.
+- Fix persistent session switch.
+
+* Sat Jul 25 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-14
- Use some patches from up to svn 613 (dated 2008-09-01).
- Add keymap.patch from Fedora bug #506470.
- Add cups listing patch from Fedora bug #509879.
More information about the scm-commits
mailing list