- updated to 1.1.0auto/ti/xorg-app-xman-1_1_0-1auto/th/xorg-app-xman-1_1_0-1

Changed files:
    xorg-app-xman-confname.patch -> 1.2
    xorg-app-xman-xaw.patch -> 1.3
    xorg-app-xman.spec -> 1.21

3 files changed, 14 insertions, 67 deletions

diff --git a/xorg-app-xman-confname.patch b/xorg-app-xman-confname.patch
index f96bf23..babde81 100644
--- a/xorg-app-xman-confname.patch
+++ b/xorg-app-xman-confname.patch
@@ -24,14 +24,11 @@
  
  SUFFIXES = .$(APP_MAN_SUFFIX) .man
  
---- xman-1.0.2/configure.ac.orig	2006-04-02 03:12:38.000000000 +0200
-+++ xman-1.0.2/configure.ac	2006-10-15 23:04:53.894640500 +0200
-@@ -67,8 +67,11 @@
- AC_CHECK_FILE([/etc/man.conf], [MANCONF="/etc/man.conf"], 
-     AC_CHECK_FILE([/etc/man.config], [MANCONF="/etc/man.config"], 
- 	AC_CHECK_FILE([/etc/manpath.config], [MANCONF="/etc/manpath.config"])))
--	
-+
+--- xman-1.1.0/configure.ac.orig	2009-10-16 23:09:03.000000000 +0200
++++ xman-1.1.0/configure.ac	2009-10-19 18:55:58.673024932 +0200
+@@ -83,6 +83,9 @@
+ fi
+ 
  if test x$MANCONF != x ; then
 +    AC_SUBST(MANCONF)
 +    BASEMANCONF="`basename $MANCONF`"
diff --git a/xorg-app-xman-xaw.patch b/xorg-app-xman-xaw.patch
deleted file mode 100644
index 6853f8a..0000000
--- a/xorg-app-xman-xaw.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit f3579250f8aa332f2015cb1352ed8b7373eb10db
-Author: James Cloos <cloos@jhcloos.com>
-Date:   Wed Aug 20 10:32:52 2008 -0400
-
-    xaw8 is gone, use xaw7
-
-diff --git a/configure.ac b/configure.ac
-index a219b35..dc33c8a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ if test x$LOCALMANPATH != x; then
- fi
- 
- # Checks for pkg-config packages
--XAW_CHECK_XPRINT_SUPPORT(XMAN)
-+PKG_CHECK_MODULES(XMAN, xaw7)
- 
- AC_ARG_WITH(manconfig,
-         AC_HELP_STRING([--with-manconfig=<filename>],
---- xman-1.0.3/Makefile.am~	2008-11-11 17:52:20.675110977 +0100
-+++ xman-1.0.3/Makefile.am	2008-11-11 17:53:07.190316386 +0100
-@@ -50,12 +50,6 @@
-         vendor.h \
-         version.h
- 
--if XAW_USE_XPRINT
--xman_SOURCES += \
--        print.c \
--        print.h
--endif
--
- appman_PRE = \
-         xman.man
- 
-@@ -63,13 +57,8 @@
- 
- appdefaultdir = @appdefaultdir@
- 
--if XAW_USE_XPRINT
--Xman: Xman-xprint.ad
--	ln -s $(top_srcdir)/Xman-xprint.ad Xman
--else
- Xman: Xman-noxprint.ad
- 	ln -s $(top_srcdir)/Xman-noxprint.ad Xman
--endif
- 
- appdefault_DATA = Xman
- 
diff --git a/xorg-app-xman.spec b/xorg-app-xman.spec
index e618bdb..3ad14d3 100644
--- a/xorg-app-xman.spec
+++ b/xorg-app-xman.spec
@@ -1,14 +1,13 @@
 Summary:	xman aplication - manual display program for the X Window System
 Summary(pl.UTF-8):	Aplikacja xman - program do wyświetlania manuali dla systemu X Window
 Name:		xorg-app-xman
-Version:	1.0.3
-Release:	3
+Version:	1.1.0
+Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/xman-%{version}.tar.bz2
-# Source0-md5:	3d3a4b310a65ccce82472ef83acbbf97
+# Source0-md5:	5e5b3351bac26cc1f8490faf1c1402bb
 Patch0:		%{name}-confname.patch
-Patch1:		%{name}-xaw.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -16,24 +15,23 @@ BuildRequires:	automake
 BuildRequires:	man-config
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-lib-libXaw-devel
-BuildRequires:	xorg-lib-libXp-devel
-BuildRequires:	xorg-lib-libXprintUtil-devel
 BuildRequires:	xorg-lib-libXt-devel >= 1.0.0
-BuildRequires:	xorg-util-util-macros >= 0.99.2
+BuildRequires:	xorg-util-util-macros >= 1.3
 Requires:	man-config
 Requires:	xorg-lib-libXt >= 1.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-xman is a manual page browser.
+xman is a graphical manual page browser using the Athena Widgets (Xaw)
+toolkit.
 
 %description -l pl.UTF-8
-xman to przeglądarka stron manuala.
+xman to graficzna przeglądarka stron manuala, wykorzystująca toolkit
+X Athena Widgets (Xaw).
 
 %prep
 %setup -q -n xman-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
@@ -57,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog
+%doc COPYING ChangeLog README
 %attr(755,root,root) %{_bindir}/xman
 %{_datadir}/X11/app-defaults/Xman
 %{_datadir}/X11/xman.help