rpms/libsx/devel libsx-trunc.diff,NONE,1.1 libsx.spec,1.14,1.15

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/libsx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29493

Modified Files:
	libsx.spec 
Added Files:
	libsx-trunc.diff 
Log Message:
- fix build (#511719)

libsx-trunc.diff:
 colorsel.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libsx-trunc.diff ---
--- libsx-2.05/src/colorsel.c.trunc	2009-09-23 16:12:48.000000000 +0200
+++ libsx-2.05/src/colorsel.c	2009-09-23 16:24:20.000000000 +0200
@@ -65,6 +65,7 @@
 static void show_best_match(Widget w, CSelData *cdata);
 */
 
+#define trunc colorsel_trunc
 int trunc(float v)
 {
   return (int)(0.5+v);


Index: libsx.spec
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libsx.spec	25 Jul 2009 08:42:55 -0000	1.14
+++ libsx.spec	23 Sep 2009 15:36:41 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           libsx
 Summary:        Simple X library
 Version:        2.05
-Release:        17%{?dist}
+Release:        18%{?dist}
 Group:          System Environment/Libraries
 License:        LGPLv2+
 Url:            ftp://ftp.ac-grenoble.fr/ge/Xlibraries/
@@ -14,6 +14,7 @@ Patch2:         libsx-strdup.diff
 Patch3:         libsx-examples.diff
 Patch4:         libsx-link_mkdir.diff
 Patch6:         libsx-rgb.diff
+Patch7:         libsx-trunc.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # libXt-devel requires libX11-devel and libXaw-devel requires libXmu-devel
 BuildRequires:  libXaw-devel libXpm-devel libXt-devel 
@@ -55,6 +56,8 @@ necessary for building programs against 
 %patch4 -p1 -b .link_mkdir
 # allow the rgb file location to be redefined
 %patch6 -p1 -b .rgb
+# prevent clash with system trunc()
+%patch7 -p1 -b .trunc
 
 # example of a simple use of the new GetFile
 cp -p %{SOURCE1} freq/simple_freq.c
@@ -118,6 +121,9 @@ rm -rf %{buildroot}
 %{_includedir}/libsx.h
 
 %changelog
+* Wed Sep 23 2009 Stepan Kasal <skasal at redhat.com> - 2.05-18
+- fix build (#511719)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.05-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild