Mailinglist Archive: opensuse-commit (1187 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package openmotif
checked in at Sun Apr 2 12:42:46 CEST 2006.

--------
--- openmotif/openmotif.changes	2006-01-25 21:39:04.000000000 +0100
+++ openmotif/openmotif.changes	2006-03-31 18:03:05.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Mar 31 18:02:52 CEST 2006 - schwab@xxxxxxx
+
+- Fix fencepost error.
+
+-------------------------------------------------------------------

New:
----
  PrintableString.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openmotif.spec ++++++
--- /var/tmp/diff_new_pack.G0u5E4/_old	2006-04-02 12:42:18.000000000 +0200
+++ /var/tmp/diff_new_pack.G0u5E4/_new	2006-04-02 12:42:18.000000000 +0200
@@ -1,11 +1,11 @@
 #
 # spec file for package openmotif (Version 2.2.4)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -13,7 +13,7 @@
 Name:         openmotif
 BuildRequires: update-desktop-files xorg-x11 xorg-x11-devel
 Version:      2.2.4
-Release:      6
+Release:        13
 License:      Other License(s), see package
 Group:        System/Libraries
 AutoReqProv:  on
@@ -30,6 +30,7 @@
 Patch4:       openmotif-xpm.diff
 Patch5:       sentinel.diff
 Patch6:       openmotif-uil.diff
+Patch7:         PrintableString.diff
 
 %description
 This is the Open Motif runtime environment.  It includes the Motif
@@ -89,6 +90,7 @@
 %patch4
 %patch5
 %patch6
+%patch7
 
 %build
 rm -f depcomp
@@ -101,6 +103,7 @@
 ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 	    --libdir=/usr/X11R6/%{_lib} \
 	    --datadir=/usr/X11R6/lib
+# Not parallel safe
 make
 
 %install
@@ -132,11 +135,9 @@
 	chmod a+r $SITEDEF
 fi
 
-%post libs
-%run_ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun libs
-%run_ldconfig
+%postun libs -p /sbin/ldconfig
 
 %postun devel
 if [ "$1" = 0 ]; then
@@ -225,6 +226,8 @@
 %doc /usr/X11R6/man/manm
 
 %changelog -n openmotif
+* Fri Mar 31 2006 - schwab@xxxxxxx
+- Fix fencepost error.
 * Wed Jan 25 2006 - mls@xxxxxxx
 - converted neededforbuild to BuildRequires
 * Mon Dec 05 2005 - schwab@xxxxxxx

++++++ PrintableString.diff ++++++
--- lib/Xm/TextF.c
+++ lib/Xm/TextF.c
@@ -3723,15 +3723,15 @@
       cache_ptr = tmp = XmStackAlloc(buf_size, cache);
    
       tmp_str = (wchar_t *)str;
-      ret_val = wctomb(tmp, *tmp_str);
+      ret_val = 0;
       count = 0;
-      while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) )
+      while (count < n && buf_size >= MB_CUR_MAX &&
+	     (ret_val = wctomb(tmp, *tmp_str)) > 0)
 	{
 	  count += 1;
 	  tmp += ret_val;
 	  buf_size -= ret_val;
 	  tmp_str++;
-	  ret_val = wctomb(tmp, *tmp_str);
 	}
          
       if (ret_val == -1)    /* bad character */


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...