Tue Jul 28 12:00:22 UTC 2009

Author: jwrdegoede

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

Modified Files:
	.cvsignore lesstif-0.95.0-PutPixel32.patch 
	lesstif-0.95.0-XxxxProperty-64bit.patch lesstif.spec sources 
Removed Files:
	lesstif-0.95-resource-fix.patch lesstif-0.95-text.patch 
	lesstif-0.95.0-64bitcleanups.patch 
	lesstif-0.95.0-CAN-2005-0605.patch 
	lesstif-0.95.0-accelkeys.patch 
	lesstif-0.95.0-attach-bottom-self.patch 
	lesstif-0.95.0-c++fix.patch lesstif-0.95.0-multilib.patch 
	lesstif-0.95.0-nolibdir.patch lesstif-0.95.0-scroll.patch 
	lesstif-0.95.0-xtungrab-warning.patch lesstif-Makefile.in.diff 
Log Message:
* Tue Jul 28 2009 Hans de Goede <hdegoede at redhat.com> 0.95.2-1
- New upstream release 0.95.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6

--- .cvsignore	7 Jul 2008 21:32:34 -0000	1.5
+++ .cvsignore	28 Jul 2009 12:00:21 -0000	1.6
@@ -1,2 +1 @@
-lesstif-0.95.0.tar.bz2
-lesstif2_0.95.0-2.1.diff.gz
+lesstif-0.95.2.tar.bz2

lesstif-0.95.0-PutPixel32.patch:
 Xpmcreate.c |   32 ++++++++------------------------
 Xpmscan.c   |    9 ++-------
 2 files changed, 10 insertions(+), 31 deletions(-)

Index: lesstif-0.95.0-PutPixel32.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif-0.95.0-PutPixel32.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lesstif-0.95.0-PutPixel32.patch	16 Jun 2008 20:39:14 -0000	1.1
+++ lesstif-0.95.0-PutPixel32.patch	28 Jul 2009 12:00:21 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/Xpmcreate.c~ lesstif-0.95.0/lib/Xm-2.1/Xpmcreate.c
---- lesstif-0.95.0/lib/Xm-2.1/Xpmcreate.c~	2008-06-16 22:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/Xpmcreate.c	2008-06-16 22:22:43.000000000 +0200
+diff -up lesstif-0.95.2/lib/Xm-2.1/Xpmcreate.c.cutpaste64 lesstif-0.95.2/lib/Xm-2.1/Xpmcreate.c
+--- lesstif-0.95.2/lib/Xm-2.1/Xpmcreate.c.cutpaste64	2007-09-12 22:27:07.000000000 +0200
++++ lesstif-0.95.2/lib/Xm-2.1/Xpmcreate.c	2009-07-28 11:32:07.000000000 +0200
 @@ -179,9 +179,7 @@ LFUNC(PutImagePixels1, void, (XImage *im
  
  LFUNC(PutPixel1, int, (XImage *ximage, int x, int y, unsigned long pixel));
@@ -11,7 +11,67 @@ diff -up lesstif-0.95.0/lib/Xm-2.1/Xpmcr
  LFUNC(PutPixel32MSB, int, (XImage *ximage, int x, int y, unsigned long pixel));
  LFUNC(PutPixel32LSB, int, (XImage *ximage, int x, int y, unsigned long pixel));
  LFUNC(PutPixel16MSB, int, (XImage *ximage, int x, int y, unsigned long pixel));
-@@ -1879,7 +1877,6 @@ PutPixel(ximage, x, y, pixel)
+@@ -1326,7 +1324,6 @@ PutImagePixels(image, width, height, pix
+  * write pixels into a 32-bits Z image data structure
+  */
+ 
+-#if !defined(WORD64) && !defined(LONG64)
+ /* this item is static but deterministic so let it slide; doesn't
+  * hurt re-entrancy of this library. Note if it is actually const then would
+  * be OK under rules of ANSI-C but probably not C++ which may not
+@@ -1334,8 +1331,6 @@ PutImagePixels(image, width, height, pix
+  */
+ static unsigned long byteorderpixel = MSBFirst << 24;
+ 
+-#endif
+-
+ /*
+    WITHOUT_SPEEDUPS is a flag to be turned on if you wish to use the original
+    3.2e code - by default you get the speeded-up version.
+@@ -1361,16 +1356,13 @@ PutImagePixels32(image, width, height, p
+ 
+     data = (unsigned char *) image->data;
+     iptr = pixelindex;
+-#if !defined(WORD64) && !defined(LONG64)
+     if (*((char *) &byteorderpixel) == image->byte_order) {
+ 	for (y = 0; y < height; y++)
+ 	    for (x = 0; x < width; x++, iptr++) {
+ 		addr = &data[ZINDEX32(x, y, image)];
+-		*((unsigned long *) addr) = pixels[*iptr];
++		*((unsigned int *) addr) = pixels[*iptr];
+ 	    }
+-    } else
+-#endif
+-    if (image->byte_order == MSBFirst)
++    } else if (image->byte_order == MSBFirst)
+ 	for (y = 0; y < height; y++)
+ 	    for (x = 0; x < width; x++, iptr++) {
+ 		addr = &data[ZINDEX32(x, y, image)];
+@@ -1398,21 +1390,18 @@ PutImagePixels32(image, width, height, p
+ 
+     data = (unsigned char *) image->data;
+     iptr = pixelindex;
+-#if !defined(WORD64) && !defined(LONG64)
+     if (*((char *) &byteorderpixel) == image->byte_order) {
+ 	for (y = 0; y < height; y++) {
+ 	    data_ptr = data;
+ 	    max_data = data_ptr + (width << 2);
+ 
+ 	    while (data_ptr < max_data) {
+-		*((unsigned long *) data_ptr) = pixels[*(iptr++)];
++		*((unsigned int *) data_ptr) = pixels[*(iptr++)];
+ 		data_ptr += (1 << 2);
+ 	    }
+ 	    data += bpl;
+ 	}
+-    } else
+-#endif
+-    if (image->byte_order == MSBFirst)
++    } else if (image->byte_order == MSBFirst)
+ 	for (y = 0; y < height; y++) {
+ 	    data_ptr = data;
+ 	    max_data = data_ptr + (width << 2);
+@@ -1879,7 +1868,6 @@ PutPixel(ximage, x, y, pixel)
      return 1;
  }
  
@@ -19,7 +79,7 @@ diff -up lesstif-0.95.0/lib/Xm-2.1/Xpmcr
  static int
  PutPixel32(ximage, x, y, pixel)
      register XImage *ximage;
-@@ -1893,10 +1890,9 @@ PutPixel32(ximage, x, y, pixel)
+@@ -1893,10 +1881,9 @@ PutPixel32(ximage, x, y, pixel)
      	return 0;
  
      addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)];
@@ -31,7 +91,7 @@ diff -up lesstif-0.95.0/lib/Xm-2.1/Xpmcr
  
  static int
  PutPixel32MSB(ximage, x, y, pixel)
-@@ -2211,15 +2207,12 @@ xpmParseDataAndCreate(display, data, ima
+@@ -2211,15 +2198,12 @@ xpmParseDataAndCreate(display, data, ima
  	    else
  		ximage->f.put_pixel = PutPixel16LSB;
  	else if (ximage->bits_per_pixel == 32)
@@ -50,3 +110,39 @@ diff -up lesstif-0.95.0/lib/Xm-2.1/Xpmcr
  	else if ((ximage->bits_per_pixel | ximage->depth) == 1)
  	    ximage->f.put_pixel = PutPixel1;
  	else
+diff -up lesstif-0.95.2/lib/Xm-2.1/Xpmscan.c.cutpaste64 lesstif-0.95.2/lib/Xm-2.1/Xpmscan.c
+--- lesstif-0.95.2/lib/Xm-2.1/Xpmscan.c.cutpaste64	2007-09-12 22:27:07.000000000 +0200
++++ lesstif-0.95.2/lib/Xm-2.1/Xpmscan.c	2009-07-28 11:32:07.000000000 +0200
+@@ -763,9 +763,7 @@ GetImagePixels(image, width, height, pma
+  * scan pixels of a 32-bits Z image data structure
+  */
+ 
+-#if !defined(WORD64) && !defined(LONG64)
+ static unsigned long byteorderpixel = MSBFirst << 24;
+-#endif
+ 
+ static int
+ GetImagePixels32(image, width, height, pmap)
+@@ -786,20 +784,17 @@ GetImagePixels32(image, width, height, p
+     iptr = pmap->pixelindex;
+     depth = image->depth;
+     lbt = low_bits_table[depth];
+-#if !defined(WORD64) && !defined(LONG64)
+     if (*((char *) &byteorderpixel) == image->byte_order) {
+ 	for (y = 0; y < height; y++)
+ 	    for (x = 0; x < width; x++, iptr++) {
+ 		addr = &data[ZINDEX32(x, y, image)];
+-		pixel = *((unsigned long *) addr);
++		pixel = *((unsigned int *) addr);
+ 		if (depth != 32)
+ 		    pixel &= lbt;
+ 		if (storePixel(pixel, pmap, iptr))
+ 		    return (XpmNoMemory);
+ 	    }
+-    } else
+-#endif
+-    if (image->byte_order == MSBFirst)
++    } else if (image->byte_order == MSBFirst)
+ 	for (y = 0; y < height; y++)
+ 	    for (x = 0; x < width; x++, iptr++) {
+ 		addr = &data[ZINDEX32(x, y, image)];

lesstif-0.95.0-XxxxProperty-64bit.patch:
 CutPaste.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: lesstif-0.95.0-XxxxProperty-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif-0.95.0-XxxxProperty-64bit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lesstif-0.95.0-XxxxProperty-64bit.patch	16 Sep 2007 16:45:50 -0000	1.2
+++ lesstif-0.95.0-XxxxProperty-64bit.patch	28 Jul 2009 12:00:21 -0000	1.3
@@ -1,174 +1,17 @@
-diff -up lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit lesstif-0.95.0/lib/Xm-2.1/CutPaste.c
---- lesstif-0.95.0/lib/Xm-2.1/CutPaste.c.XxxxProperty-64bit	2004-08-28 21:22:43.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/CutPaste.c	2007-09-16 18:42:27.000000000 +0200
-@@ -62,7 +62,7 @@ static void _XmClipboardDeleteMarked(Dis
- 				     XmClipboard * clip);
- static void _XmClipboardDeleteFormat(Display *display, int id);
- static int _XmClipboardRegisterFormat(Display *display, char *format_name,
--				      int format_len);
-+				      long format_len);
- static void _XmClipboardDeleteFormats(Display *display, Window window, int id);
- static void _XmClipboardDeleteItem(Display *display, Window window,
- 				   XmClipboard * clip, unsigned item);
-@@ -241,7 +241,7 @@ _XmClipboardDeleteItemLabel(Display *dis
- 
- 
- static int
--_XmClipboardRegisterFormat(Display *display, char *format_name, int format_len)
-+_XmClipboardRegisterFormat(Display *display, char *format_name, long format_len)
- {
-     Atom fmt;
-     int flen;
-@@ -606,7 +606,17 @@ _XmClipboardGetWindowProperty(Display *d
- 
- 	ret_buf = (unsigned *)XtRealloc((char *)ret_buf,
- 					alloc_size + alloc_incr + 1);
--	memcpy(&ret_buf[offset], prop, alloc_incr);
-+        /* Fixup X*Property long == 32 bits confusion if needed */
-+        if (actual_format == 32 && sizeof(long) != 4)
-+        {
-+            int i;
-+            unsigned long *in = (unsigned long *)prop;
-+            
-+            for (i = 0; i < nitems; i++)
-+                ret_buf[offset + i] = in[i];
-+        }
-+        else
-+	    memcpy(&ret_buf[offset], prop, alloc_incr);
- 	alloc_size += alloc_incr;
- 
- 	switch (actual_format)
-@@ -1001,8 +1011,9 @@ _XmClipboardReplaceItem(Display *display
- {
-     Window root;
-     Atom item;
--    int nunits, tstart, tlen;
-+    int i, nunits, tstart, tlen;
-     long transferlen;
-+    long *convert_buf = NULL;
- 
-     root = DefaultRootWindow(display);
-     item = _XmClipboardGetAtomFromId(display, id);
-@@ -1014,6 +1025,14 @@ _XmClipboardReplaceItem(Display *display
-     case 32:
- 	len >>= 2;
- 	nunits = transferlen;
-+	/* XChangeProperty expects a buffer of longs when receiving 32 bits
-+	   data, MEUHH */
-+	if (sizeof(long) != 4)
+diff -up lesstif-0.95.2/lib/Xm-2.1/CutPaste.c.long64 lesstif-0.95.2/lib/Xm-2.1/CutPaste.c
+--- lesstif-0.95.2/lib/Xm-2.1/CutPaste.c.long64	2007-09-12 22:05:58.000000000 +0200
++++ lesstif-0.95.2/lib/Xm-2.1/CutPaste.c	2009-07-28 11:32:20.000000000 +0200
+@@ -1028,9 +1028,11 @@ _XmClipboardReplaceItem(Display *display
+ 	/* XChangeProperty expects a buffer of longs when receiving 32 bits
+ 	   data, MEUHH */
+ 	if (sizeof(long) != 4)
 +	{
-+	    convert_buf = XtMalloc(len * sizeof(long));
+ 	    convert_buf = XtMalloc(len * sizeof(long));
+-        for (i = 0; i < len; i++)
+-            convert_buf[i] = data[i];
 +	    for (i = 0; i < len; i++)
 +                convert_buf[i] = data[i];
 +	}
  	break;
  
      case 16:
-@@ -1040,7 +1059,9 @@ _XmClipboardReplaceItem(Display *display
- 	}
- 
- 	XChangeProperty(display, root, item, item, format, mode,
--			(unsigned char *)&data[tstart], tlen);
-+			convert_buf? (unsigned char *)&convert_buf[tstart] :
-+                                     (unsigned char *)&data[tstart],
-+                        tlen);
- 
- 	len -= tlen;
- 	mode = PropModeAppend;
-@@ -1160,7 +1181,7 @@ _XmClipboardGetLenFromFormat(Display *di
-     }
-     else
-     {
--	*format = *((int *)(prop));
-+	*format = *((long *)(prop));
- 	ret = True;
-     }
- 
-diff -up lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit lesstif-0.95.0/clients/Motif-2.1/mwm/props.c
---- lesstif-0.95.0/clients/Motif-2.1/mwm/props.c.XxxxProperty-64bit	2004-08-28 21:25:46.000000000 +0200
-+++ lesstif-0.95.0/clients/Motif-2.1/mwm/props.c	2007-09-16 18:41:04.000000000 +0200
-@@ -92,15 +92,28 @@ PROP_Initialize(void)
- void
- PROP_SetBehavior(ScreenInfo *scr, Boolean custom)
- {
--    PropMotifWmInfo info;
-+    long info[PROP_MWM_INFO_ELEMENTS];
- 
--    /* set the MWM_INFO property on the Root */
-+    /* set the MWM_INFO property on the Root, notice that we
-+       use an array of longs here and not the PropMotifWmInfo struct,
-+       this is because this struct looks like this in lesstif:
-+       
-+       typedef struct {
-+           CARD32 flags;
-+           CARD32 wmWindow;
-+       } PropMotifWmInfo;
-+       
-+       But when setting 32 bit properties XChangeProperty expects an array of
-+       longs, which it will convert to 32 bit values if need. Thus passing an
-+       actual PropMotifWmInfo struct will mess things up on archs where longs
-+       are 64 bit. */
-+    
-     if (custom)
--	info.flags = MWM_INFO_STARTUP_CUSTOM;
-+	info[0] = MWM_INFO_STARTUP_CUSTOM;   /* set flags "member" */
-     else
--	info.flags = MWM_INFO_STARTUP_STANDARD;
-+	info[0] = MWM_INFO_STARTUP_STANDARD; /* set flags "member" */
- 
--    info.wmWindow = scr->root_win;
-+    info[1] = scr->root_win; /* set wmWindow "member" */
- 
-     XChangeProperty(dpy, scr->root_win, XA_MWM_INFO, XA_MWM_INFO,
- 		    32, PropModeReplace,
-@@ -129,7 +142,18 @@ PROP_GetBehavior(ScreenInfo *scr)
-     int actual_format, ret;
-     Atom actual_type;
-     unsigned long nitems, bytesafter;
--    PropMotifWmInfo *info;
-+    /* We use a long pointer here and not a PropMotifWmInfo pointer,
-+       this is because this type looks like this in lesstif:
-+       
-+       typedef struct {
-+           CARD32 flags;
-+           CARD32 wmWindow;
-+       } PropMotifWmInfo;
-+       
-+       But when getting 32 bit properties XGetWindowProperty returns an array
-+       of longs. Thus interpreting the returned data as PropMotifWmInfo will
-+       mess things up on archs where longs are 64 bit. */
-+    unsigned long *info;
- 
-     if (XGetWindowProperty(dpy, scr->root_win, XA_MWM_INFO, 0L,
- 			   PROP_MOTIF_WM_INFO_ELEMENTS, False,
-@@ -138,7 +162,7 @@ PROP_GetBehavior(ScreenInfo *scr)
- 			   (unsigned char **)&info) == Success)
-     {
- 	if (nitems > 0 && info)
--	    ret = info->flags;
-+	    ret = info[0]; /* Return flags "member" */
- 	else
- 	    ret = 0;
- 	XFree((char *)info);
-@@ -284,7 +308,21 @@ PROP_GetMwmHints(MwmWindow *win)
-     {
- 
- 	if (nitems >= PROP_MOTIF_WM_HINTS_ELEMENTS)
-+	{
-+	    /* Fixup X*Property long == 32 bits confusion if needed */
-+	    if (sizeof(long) != 4)
-+	    {
-+	        long *prop_hints = (long *)win->mwm_hints;
-+	        win->mwm_hints = XtMalloc(sizeof(MwmHints));
-+	        win->mwm_hints->flags       = prop_hints[0];
-+	        win->mwm_hints->functions   = prop_hints[1];
-+	        win->mwm_hints->decorations = prop_hints[2];
-+	        win->mwm_hints->input_mode  = prop_hints[3];
-+	        win->mwm_hints->status      = prop_hints[4];
-+	        XFree(prop_hints);
-+	    }
- 	    return;
-+        }
- 
- 	XFree((char *)win->mwm_hints);
-     }


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- lesstif.spec	25 Jul 2009 05:05:23 -0000	1.27
+++ lesstif.spec	28 Jul 2009 12:00:22 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: OSF/Motif library clone
 Name: lesstif
-Version: 0.95.0
-Release: 29%{?dist}
+Version: 0.95.2
+Release: 1%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -37,32 +37,12 @@ Source0: http://downloads.sourceforge.ne
 Source1: lesstif-xmbind
 # mwm session file
 Source2: mwm.desktop
-# put mwm conf file in %{_sysconfdir}, and install Dt in %_libdir
-Patch0: lesstif-Makefile.in.diff
-# have motif-config honor libdir
-Patch1: lesstif-0.95.0-multilib.patch
-Patch2: lesstif-0.95.0-CAN-2005-0605.patch
-Patch3: lesstif-0.95.0-64bitcleanups.patch
-Patch4: lesstif-0.95.0-c++fix.patch
-Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.1.diff.gz
-Patch6: lesstif-0.95.0-scroll.patch
-Patch8: lesstif-0.95-resource-fix.patch
-Patch9: lesstif-0.95-text.patch
-Patch10: lesstif-0.95.0-XxxxProperty-64bit.patch
-Patch11: lesstif-0.95.0-accelkeys.patch
-Patch12: lesstif-0.95.0-attach-bottom-self.patch
-Patch13: lesstif-0.95.0-xtungrab-warning.patch
-# remove reference to libdir, since it is not necessary, and leads to
-# conflict in multiarch setups
-Patch14: lesstif-0.95.0-nolibdir.patch
-Patch15: lesstif-0.95.0-PutPixel32.patch
+Patch0: lesstif-0.95.2-motif-config.patch
+Patch1: lesstif-0.95.0-XxxxProperty-64bit.patch
+Patch2: lesstif-0.95.0-PutPixel32.patch
 
 Url: http://www.lesstif.org/
 
-# monolithic X
-#BuildRequires: xorg-x11-devel
-#BuildRequires: xorg-x11-deprecated-libs-devel
-
 BuildRequires: libXp-devel libXt-devel libXext-devel 
 BuildRequires: freetype-devel fontconfig-devel
 # lynx is used to transform html in txt
@@ -144,65 +124,41 @@ along with lesstif.
 %setup -q
 chmod a-x COPYING* doc/www.lesstif.org/BUG-HUNTING.html
 %patch0 -p1
-%patch1 -p1 -b .multilib
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1 -b .VendorSP
-%patch5 -p1
-%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1 -b .XxxxProperty-64bit
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1 -b .nolibdir
-%patch15 -p1
-
-# and pick up some fixes from Debian
-patch -p1 < debian/patches/020_xpmpipethrough.diff
-patch -p1 < debian/patches/021_xim_chained_list_crash.diff
-patch -p1 < debian/patches/030_manpage.diff
-patch -p1 < debian/patches/020_render_table_crash.diff
-# patch3 is 020_bad_integer_cast.diff
-# patch0 contains 000_libtool_linking.diff
-# Patch2 is 020_unsigned_int.diff
-# 000_bootstrap_script.diff, 010_rebootstrap.diff not useful.
-# 020_missing_xm_h.diff?
-
-# correct patched header file timestamp
-touch -r include/Motif-2.1/Xm/VendorSP.h.VendorSP include/Motif-2.1/Xm/VendorSP.h
-
-# those substitutions are not really usefull, since the symbols are redefined
-# in the Makefile, but it is clearer like that
-touch -r clients/Motif-2.1/mwm/mwm.h __mwm_stamp
-sed -i -e 's:"/usr/X11/include":"%{_includedir}":' \
-  -e 's:"/usr/lib/X11/mwm":"%{_sysconfdir}/mwm":' clients/Motif-2.1/mwm/mwm.h
-touch -r __mwm_stamp clients/Motif-2.1/mwm/mwm.h
-rm __mwm_stamp
+
 
 %build
 # --enable-shared --disable-static is the default
 # the x libs and includes are empty in the default case, but we need to 
 # have a non empty include defined (for a substitution in mwm)
 
+#  --enable-production \
+#  --disable-debug \
+
 # --enable-production is needed in order to avoid 
 # http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4124
 %configure \
   --enable-shared \
   --disable-static \
   --with-xdnd \
-  --enable-production \
-  --disable-debug \
   --x-includes=%{_includedir} \
   --x-libraries=%{_libdir}
 
-make %{?_smp_mflags}
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags} \
+ mwmddir='%{_sysconfdir}/mwm' libdir='%{_libdir}' \
+ appdir='%{_datadir}/X11/app-defaults' configdir='%{_datadir}/X11/config'
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT \
+ mwmddir='%{_sysconfdir}/mwm' libdir='%{_libdir}' \
  appdir='%{_datadir}/X11/app-defaults' configdir='%{_datadir}/X11/config' \
  INSTALL="install -p"
 
@@ -236,9 +192,6 @@ mkdir -p $RPM_BUILD_ROOT%{_includedir}/X
 # will be in in %%doc
 rm $RPM_BUILD_ROOT%{_sysconfdir}/mwm/README $RPM_BUILD_ROOT%{_sysconfdir}/mwm/alt.map
 
-# the corresponding file is not shipped
-rm $RPM_BUILD_ROOT%{_mandir}/man*/ltversion*
-
 # prepare docs
 rm -rf __dist_clean_docs
 cp -a doc __dist_clean_docs
@@ -256,6 +209,10 @@ done
 # remove the empty directory
 rmdir __dist_clean_docs/lessdox/functions
 
+# the corresponding file is not shipped
+rm $RPM_BUILD_ROOT%{_mandir}/man*/ltversion*
+rm __dist_clean_docs/lessdox/clients/ltversion.html
+
 # remove host.def, it lives in the imake package
 rm $RPM_BUILD_ROOT%{_datadir}/X11/config/host.def
 
@@ -318,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 28 2009 Hans de Goede <hdegoede at redhat.com> 0.95.2-1
+- New upstream release 0.95.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.95.0-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Jul 2008 21:32:34 -0000	1.5
+++ sources	28 Jul 2009 12:00:22 -0000	1.6
@@ -1,2 +1 @@
-ab895165c149d7f95843c7584b1c7ad4  lesstif-0.95.0.tar.bz2
-89e1e1823eb37a40a54330a834c68b6b  lesstif2_0.95.0-2.1.diff.gz
+754187dbac09fcf5d18296437e72a32f  lesstif-0.95.2.tar.bz2


--- lesstif-0.95-resource-fix.patch DELETED ---


--- lesstif-0.95-text.patch DELETED ---


--- lesstif-0.95.0-64bitcleanups.patch DELETED ---


--- lesstif-0.95.0-CAN-2005-0605.patch DELETED ---


--- lesstif-0.95.0-accelkeys.patch DELETED ---


--- lesstif-0.95.0-attach-bottom-self.patch DELETED ---


--- lesstif-0.95.0-c++fix.patch DELETED ---


--- lesstif-0.95.0-multilib.patch DELETED ---


--- lesstif-0.95.0-nolibdir.patch DELETED ---


--- lesstif-0.95.0-scroll.patch DELETED ---


--- lesstif-0.95.0-xtungrab-warning.patch DELETED ---


--- lesstif-Makefile.in.diff DELETED ---


