SPECS: openssh-x11-askpass.spec - rel 6 - updated for modular xorg

[baggins]

Author: baggins                      Date: Thu Sep  6 15:47:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 6
- updated for modular xorg

---- Files affected:
SPECS:
   openssh-x11-askpass.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/openssh-x11-askpass.spec
diff -u SPECS/openssh-x11-askpass.spec:1.28 SPECS/openssh-x11-askpass.spec:1.29
--- SPECS/openssh-x11-askpass.spec:1.28	Tue Feb 13 08:16:51 2007
+++ SPECS/openssh-x11-askpass.spec	Thu Sep  6 17:47:46 2007
@@ -12,17 +12,19 @@
 Summary(uk.UTF-8):	OpenSSH - діалог вводу ключової фрази (passphrase) для X11
 Name:		openssh-x11-askpass
 Version:	1.2.4.1
-Release:	5
+Release:	6
 License:	Free
 Group:		Applications/Networking
 Source0:	http://www.jmknoble.net/software/x11-ssh-askpass/%{_rn}-%{version}.tar.gz
 # Source0-md5:	8f2e41f3f7eaa8543a2440454637f3c3
 URL:		http://www.jmknoble.net/software/x11-ssh-askpass/
-BuildRequires:	XFree86-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-proto-xproto-devel
 Requires:	openssh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
+%define		_appdefsdir	%{_datadir}/X11/app-defaults
 
 %description
 This is an X11-based passphrase dialog for use with OpenSSH.
@@ -54,9 +56,15 @@
 
 %prep
 %setup -q -n %{_rn}-%{version}
+rm -f Imakefile
 
 %build
+./configure \
+	--libexecdir=%{_bindir} \
+	--mandir=%{_mandir} \
+	--with-app-defaults-dir=%{_appdefsdir}
 xmkmf
+
 %{__make} includes all \
 	CC="%{__cc}" \
 	CDEBUGFLAGS="%{rpmcflags}"
@@ -65,8 +73,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	BINDIR=%{_bindir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2007/09/06 15:47:46  baggins
+- rel 6
+- updated for modular xorg
+
 Revision 1.28  2007/02/13 07:16:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssh-x11-askpass.spec?r1=1.28&r2=1.29&f=u