rpms/nx/devel nx-gcc44.patch,NONE,1.1 nx.spec,1.29,1.30
Miloš Jakubíček
mjakubicek at fedoraproject.org
Sun May 17 11:07:27 UTC 2009
Author: mjakubicek
Update of /cvs/pkgs/rpms/nx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17889/devel
Modified Files:
nx.spec
Added Files:
nx-gcc44.patch
Log Message:
- Fix FTBFS: added nx-gcc44.patch.
nx-gcc44.patch:
--- NEW FILE nx-gcc44.patch ---
--- nx-3.3.0/nxcomp/Loop.cpp.orig 2009-05-17 12:22:19.000000000 +0200
+++ nx-3.3.0/nxcomp/Loop.cpp 2009-05-17 12:22:43.000000000 +0200
@@ -10979,7 +10979,7 @@
packMethod == PACK_LOSSLESS ||
packMethod == PACK_ADAPTIVE)
{
- char *dash = rindex(opt, '-');
+ const char *dash = rindex(opt, '-');
if (dash != NULL && strlen(dash) == 2 &&
*(dash + 1) >= '0' && *(dash + 1) <= '9')
Index: nx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nx/devel/nx.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nx.spec 28 Feb 2009 22:00:49 -0000 1.29
+++ nx.spec 17 May 2009 11:07:21 -0000 1.30
@@ -8,7 +8,7 @@
Summary: Proxy system for X11
Name: nx
Version: 3.3.0
-Release: 33%{?dist}
+Release: 34%{?dist}
# MIT on the X11 bits
License: GPLv2 and MIT
Group: Applications/Internet
@@ -32,6 +32,8 @@ Source9: nxwrapper.in
Source10: docs.tar.bz2
Source11: nxfind-provides.sh
+# Sent via upstream web form on 2009/05/17 (enquiry ID DE05C00477).
+Patch0: nx-gcc44.patch
%define _use_internal_dependency_generator 0
%define __find_provides sh %{SOURCE11}
@@ -55,6 +57,7 @@ NX provides a proxy system for the X Win
%prep
%setup -q -c %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
+%patch0 -p1 -b .gcc44
perl -pi -e's,-L/usr/X11R6/lib,-L%{_x_libraries},' nxcompshad/Makefile.in
export CFLAGS="%{optflags}"
%ifarch x86_64 ppc64
@@ -168,6 +171,9 @@ rm -rf %{buildroot}
%{_pkglibexecdir}
%changelog
+* Sun May 17 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.3.0-34
+- Fix FTBFS: added nx-gcc44.patch.
+
* Sat Feb 14 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 3.3.0-33
- Update to 3.3.0.
More information about the fedora-extras-commits
mailing list