.gear/rules                                        |    2 +
 .../tags/b690f894c72024cbebc5f61f889049c0cfc5a446  |    6 ++
 .gear/tags/list                                    |    1 +
 Makefile.am                                        |    7 +-
 Xmessage-color.ad                                  |   44 ---------------
 Xmessage.ad                                        |    6 --
 app-defaults/Xmessage-color.ad                     |   44 +++++++++++++++
 app-defaults/Xmessage.ad                           |    6 ++
 configure.ac                                       |    2 +-
 makeform.c                                         |    2 +-
 xmessage.spec                                      |   59 ++++++++++++++++++++
 11 files changed, 124 insertions(+), 55 deletions(-)

diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..f78a96e
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: @name@-@version@:.
+diff: @name@-@version@:. .
diff --git a/.gear/tags/b690f894c72024cbebc5f61f889049c0cfc5a446 b/.gear/tags/b690f894c72024cbebc5f61f889049c0cfc5a446
new file mode 100644
index 0000000..d646ea6
--- /dev/null
+++ b/.gear/tags/b690f894c72024cbebc5f61f889049c0cfc5a446
@@ -0,0 +1,6 @@
+object 24f1760790a9d2f73cac94bc00d8137fefac9f38
+type commit
+tag xmessage-1.0.2
+tagger Matthieu Herrb <matthieu@bluenote.herrb.com> 1186737511 +0200
+
+xmessage version 1.0.2
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..9411fbc
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+b690f894c72024cbebc5f61f889049c0cfc5a446 xmessage-1.0.2
diff --git a/Makefile.am b/Makefile.am
index f77a22e..b068461 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xmessage
 
-xmessage_CFLAGS = $(XMESSAGE_CFLAGS)
+AM_CFLAGS = $(XMESSAGE_CFLAGS)
 xmessage_LDADD = $(XMESSAGE_LIBS)
 
 xmessage_SOURCES =	\
@@ -40,12 +40,13 @@ appdefaultdir = @appdefaultdir@
 
 
 APPDEFAULTFILES = \
-        Xmessage \
-        Xmessage-color
+        app-defaults/Xmessage \
+        app-defaults/Xmessage-color
 
 SUFFIXES = .ad
 
 .ad:
+	$(mkdir_p) app-defaults
 	cp $< $@
 
 appdefault_DATA = $(APPDEFAULTFILES)
diff --git a/Xmessage-color.ad b/Xmessage-color.ad
deleted file mode 100644
index 8d5f433..0000000
--- a/Xmessage-color.ad
+++ /dev/null
@@ -1,44 +0,0 @@
-! $XFree86$
-
-#include "Xmessage"
-
-*background:			gray85
-*foreground:			gray15
-
-*Scrollbar.thumb:		vlines2
-*Scrollbar.width:		14
-*Scrollbar.foreground:		rgb:a/5/5
-*Scrollbar.borderWidth:		0
-*Scrollbar.displayList:\
-foreground	gray90;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray60;\
-lines		-1,0,0,0,0,-1
-
-*Text.?.cursorColor:		rgb:d/5/5
-*Text.borderColor:		gray80
-*Text*background:		gray96
-*Text*Scrollbar.background:	gray80
-*Text.displayList:\
-foreground	gray90;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray60;\
-lines		-1,0,0,0,0,-1
-
-*Command.highlightThickness:	2
-*Command.internalWidth:		5
-*Command.internalHeight:	3
-*Command.borderColor:		gray40
-*Command.shapeStyle:		Rectangle
-*Command.background:		gray80
-*Command.displayList:\
-foreground	gray60;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray90;\
-lines		-1,0,0,0,0,-1
-
-*Form.displayList:\
-foreground	gray60;\
-lines		1,-1,-1,-1,-1,1;\
-foreground	gray90;\
-lines		-1,0,0,0,0,-1
diff --git a/Xmessage.ad b/Xmessage.ad
deleted file mode 100644
index 1028ed2..0000000
--- a/Xmessage.ad
+++ /dev/null
@@ -1,6 +0,0 @@
-! $XConsortium: Xmessage.ad,v 1.3 94/07/26 20:23:17 gildea Exp $
-*baseTranslations: 		#override :<Key>Return: default-exit()
-*message.scrollVertical:	Always
-*message.scrollHorizontal:	Never
-*Command.shapeStyle:		oval
-*Command.highlightThickness:	1
diff --git a/app-defaults/Xmessage-color.ad b/app-defaults/Xmessage-color.ad
new file mode 100644
index 0000000..8d5f433
--- /dev/null
+++ b/app-defaults/Xmessage-color.ad
@@ -0,0 +1,44 @@
+! $XFree86$
+
+#include "Xmessage"
+
+*background:			gray85
+*foreground:			gray15
+
+*Scrollbar.thumb:		vlines2
+*Scrollbar.width:		14
+*Scrollbar.foreground:		rgb:a/5/5
+*Scrollbar.borderWidth:		0
+*Scrollbar.displayList:\
+foreground	gray90;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray60;\
+lines		-1,0,0,0,0,-1
+
+*Text.?.cursorColor:		rgb:d/5/5
+*Text.borderColor:		gray80
+*Text*background:		gray96
+*Text*Scrollbar.background:	gray80
+*Text.displayList:\
+foreground	gray90;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray60;\
+lines		-1,0,0,0,0,-1
+
+*Command.highlightThickness:	2
+*Command.internalWidth:		5
+*Command.internalHeight:	3
+*Command.borderColor:		gray40
+*Command.shapeStyle:		Rectangle
+*Command.background:		gray80
+*Command.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+
+*Form.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
diff --git a/app-defaults/Xmessage.ad b/app-defaults/Xmessage.ad
new file mode 100644
index 0000000..1028ed2
--- /dev/null
+++ b/app-defaults/Xmessage.ad
@@ -0,0 +1,6 @@
+! $XConsortium: Xmessage.ad,v 1.3 94/07/26 20:23:17 gildea Exp $
+*baseTranslations: 		#override :<Key>Return: default-exit()
+*message.scrollVertical:	Always
+*message.scrollHorizontal:	Never
+*Command.shapeStyle:		oval
+*Command.highlightThickness:	1
diff --git a/configure.ac b/configure.ac
index e2cebc8..89a8cf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XMESSAGE)
+PKG_CHECK_MODULES(XMESSAGE, xaw7)
 AC_SUBST(XMESSAGE_CFLAGS)
 AC_SUBST(XMESSAGE_LIBS)
 
diff --git a/makeform.c b/makeform.c
index ad16098..898b554 100644
--- a/makeform.c
+++ b/makeform.c
@@ -56,7 +56,7 @@ unquote_pairs (ButtonRecord *br, int n)
 {
     int i;
 
-    for (i = 0; i < n; i++) {
+    for (i = 0; i < n; i++, br++) {
 	char *dst, *src;
 	int quoted = 0;
 
diff --git a/xmessage.spec b/xmessage.spec
new file mode 100644
index 0000000..29d6b6a
--- /dev/null
+++ b/xmessage.spec
@@ -0,0 +1,59 @@
+Name: xmessage
+Version: 1.0.2
+Release: alt2
+Summary: display a message or query in a window
+License: MIT/X11
+Group: System/X11
+Url: http://xorg.freedesktop.org
+Packager: Valery Inozemtsev <shrek@altlinux.ru>
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+BuildRequires: libICE-devel libSM-devel libX11-devel libXau-devel
+BuildRequires: libXaw-devel libXext-devel libXmu-devel
+BuildRequires: libXpm-devel libXt-devel xorg-proto-devel
+BuildRequires: xorg-util-macros libXdmcp-devel
+
+%description
+The  xmessage  program  displays a window containing a message from the
+command line, a file, or standard input.  Along the lower edge  of  the
+message  is  row  of  buttons; clicking the left mouse button on any of
+these buttons will cause xmessage to exit.  Which button was pressed is
+returned  in  the  exit status and, optionally, by writing the label of
+the button to standard output.
+
+%prep
+%setup -q
+%patch -p1
+
+%build
+%autoreconf
+%configure
+
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+%files
+%_sysconfdir/X11/app-defaults/*
+%_bindir/*
+%_man1dir/*
+
+%changelog
+* Sat Nov 08 2008 Valery Inozemtsev <shrek@altlinux.ru> 1.0.2-alt2
+- rebuild with libXaw.so.7
+
+* Fri Aug 10 2007 Valery Inozemtsev <shrek@altlinux.ru> 1.0.2-alt1
+- 1.0.2
+
+* Tue Dec 27 2005 Valery Inozemtsev <shrek@altlinux.ru> 1.0.1-alt1
+- Xorg-7.0
+
+* Sun Dec 04 2005 Valery Inozemtsev <shrek@altlinux.ru> 0.99.2-alt1
+- Xorg-7.0RC3
+
+* Thu Nov 24 2005 Valery Inozemtsev <shrek@altlinux.ru> 0.99.1-alt0.1
+- initial release
+