OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Nov-2004 18:30:19
Branch: HEAD Handle: 2004110517301900
Modified files:
openpkg-src/kerberos kerberos.spec
Log:
repair installation directories (includedir, libdir, sbindir) as found
by Thomas MOSCHNY
Summary:
Revision Changes Path
1.54 +4 -21 openpkg-src/kerberos/kerberos.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 15 Oct 2004 13:24:05 -0000 1.53
+++ openpkg-src/kerberos/kerberos.spec 5 Nov 2004 17:30:19 -0000 1.54
@@ -38,7 +38,7 @@
Group: Cryptography
License: MIT subject to US EAR
Version: %{V_major}.%{V_minor}
-Release: 20041015
+Release: 20041105
# package options
%option with_fsl yes
@@ -99,6 +99,9 @@
LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
+ --includedir=%{l_prefix}/include/kerberos \
+ --libdir=%{l_prefix}/lib/kerberos \
+ --sbindir=%{l_prefix}/libexec/kerberos \
--without-tcl \
--without-krb4 \
--disable-shared
@@ -114,9 +117,6 @@
# polish installation
%{l_shtool} mkdir -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/include/kerberos \
- $RPM_BUILD_ROOT%{l_prefix}/lib/kerberos \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/kerberos \
$RPM_BUILD_ROOT%{l_prefix}/var/kerberos/log \
$RPM_BUILD_ROOT%{l_prefix}/share/kerberos/doc \
$RPM_BUILD_ROOT%{l_prefix}/etc/kerberos \
@@ -143,9 +143,6 @@
done
for i in ftpd telnetd uuserver ; do
- mv \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/$i \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/kerberos/k$i
if test -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/$i.8 ; then
mv \
$RPM_BUILD_ROOT%{l_prefix}/man/man8/$i.8 \
@@ -153,20 +150,6 @@
fi
done
- mv \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/* \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/kerberos/
- rmdir $RPM_BUILD_ROOT%{l_prefix}/sbin
-
- mv \
- $RPM_BUILD_ROOT%{l_prefix}/include/*.h \
- $RPM_BUILD_ROOT%{l_prefix}/include/gssapi \
- $RPM_BUILD_ROOT%{l_prefix}/include/kerberosIV \
- $RPM_BUILD_ROOT%{l_prefix}/include/kerberos/
- mv \
- $RPM_BUILD_ROOT%{l_prefix}/lib/*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/kerberos/
-
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gnats
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
