summaryrefslogtreecommitdiff
path: root/contrib/redhat/openssh.spec
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-30 11:09:54 +1000
committerDamien Miller <djm@mindrot.org>2002-09-30 11:09:54 +1000
commitd0875620415fadcd150cada0061c1b099d3f436a (patch)
treeca130ab1defa2fdb8aa45fc3712da4c79dc3ddef /contrib/redhat/openssh.spec
parente81a65b1aab754ce59b0f37a85b4dbff4be30219 (diff)
Use contrib/ Makefile for building askpass programs
Diffstat (limited to 'contrib/redhat/openssh.spec')
-rw-r--r--contrib/redhat/openssh.spec23
1 files changed, 8 insertions, 15 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 14be171f8..bf9c97035 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -98,7 +98,7 @@ BuildPreReq: db1-devel, /usr/include/security/pam_appl.h
98BuildPreReq: XFree86-devel 98BuildPreReq: XFree86-devel
99%endif 99%endif
100%if ! %{no_gnome_askpass} 100%if ! %{no_gnome_askpass}
101BuildPreReq: gnome-libs-devel 101BuildPreReq: pkgconfig
102%endif 102%endif
103%if %{kerberos5} 103%if %{kerberos5}
104BuildPreReq: krb5-devel 104BuildPreReq: krb5-devel
@@ -234,25 +234,15 @@ popd
234%if ! %{no_gnome_askpass} 234%if ! %{no_gnome_askpass}
235pushd contrib 235pushd contrib
236if [ $gtk2 = yes ] ; then 236if [ $gtk2 = yes ] ; then
237 gcc $RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0` \ 237 make gnome-ssh-askpass2
238 gnome-ssh-askpass2.c -o gnome-ssh-askpass \ 238 mv gnome-ssh-askpass2 gnome-ssh-askpass
239 `pkg-config --libs gtk+-2.0`
240else 239else
241 gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \ 240 make gnome-ssh-askpass1
242 gnome-ssh-askpass1.c -o gnome-ssh-askpass \ 241 mv gnome-ssh-askpass1 gnome-ssh-askpass
243 `gnome-config --libs gnome gnomeui`
244fi 242fi
245popd 243popd
246%endif 244%endif
247 245
248%if ! %{no_gnome_askpass}
249pushd contrib
250gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \
251 gnome-ssh-askpass.c -o gnome-ssh-askpass \
252 `gnome-config --libs gnome gnomeui`
253popd
254%endif
255
256%install 246%install
257rm -rf $RPM_BUILD_ROOT 247rm -rf $RPM_BUILD_ROOT
258mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh 248mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh
@@ -406,6 +396,9 @@ fi
406%endif 396%endif
407 397
408%changelog 398%changelog
399* Mon Sep 30 2002 Damien Miller <djm@mindrot.org>
400- Use contrib/ Makefile for building askpass programs
401
409* Fri Jun 21 2002 Damien Miller <djm@mindrot.org> 402* Fri Jun 21 2002 Damien Miller <djm@mindrot.org>
410- Merge in spec changes from seba@iq.pl (Sebastian Pachuta) 403- Merge in spec changes from seba@iq.pl (Sebastian Pachuta)
411- Add new {ssh,sshd}_config.5 manpages 404- Add new {ssh,sshd}_config.5 manpages