SPECS: krb5.spec - simplify builddir

glen glen at pld-linux.org
Mon Nov 17 09:13:09 CET 2008


Author: glen                         Date: Mon Nov 17 08:13:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplify builddir

---- Files affected:
SPECS:
   krb5.spec (1.119 -> 1.120) 

---- Diffs:

================================================================
Index: SPECS/krb5.spec
diff -u SPECS/krb5.spec:1.119 SPECS/krb5.spec:1.120
--- SPECS/krb5.spec:1.119	Sat Nov  1 17:48:47 2008
+++ SPECS/krb5.spec	Mon Nov 17 09:13:04 2008
@@ -543,7 +543,7 @@
 %prep
 %setup -q -c
 tar xf %{name}-%{version}.tar.gz
-cd %{name}-%{version}
+mv %{name}-%{version}/* .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -585,7 +585,7 @@
 cp src/krb524/README README.krb524
 
 %build
-cd %{name}-%{version}/src
+cd src
 # Get LFS support on systems that need it which aren't already 64-bit.
 %ifarch %{ix86} s390 ppc sparc
 CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64 -fPIC -I%{_includedir}/et -I%{_includedir}/ncurses"
@@ -634,7 +634,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{name}-%{version}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_localstatedir},/var/log/kerberos,%{_infodir},%{_mandir}}
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig/rc-inetd,shrc.d,logrotate.d}
 
@@ -753,7 +752,7 @@
 
 %files server
 %defattr(644,root,root,755)
-%doc %{name}-%{version}/doc/krb5-{admin,install}.html %{name}-%{version}/doc/{admin,install,krb425}-guide.pdf
+%doc doc/krb5-{admin,install}.html doc/{admin,install,krb425}-guide.pdf
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kerberos
@@ -821,7 +820,7 @@
 %if %{with krb4}
 %files server-krb524d
 %defattr(644,root,root,755)
-%doc %{name}-%{version}/doc/krb425.html
+%doc doc/krb425.html
 %attr(754,root,root) /etc/rc.d/init.d/krb524d
 %attr(755,root,root) %{_sbindir}/kadmind4
 %attr(755,root,root) %{_sbindir}/krb524d
@@ -829,7 +828,7 @@
 
 %files client
 %defattr(644,root,root,755)
-%doc %{name}-%{version}/doc/krb5-user.html %{name}-%{version}/doc/user-guide.pdf
+%doc doc/krb5-user.html doc/user-guide.pdf
 %attr(755,root,root) /etc/shrc.d/kerberos.*
 
 %attr(755,root,root) %{_bindir}/kdestroy
@@ -933,7 +932,7 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc %{name}-%{version}/doc/{kadmin,krb5-protocol} %{name}-%{version}/doc/{api,implement,kadm5}/*.pdf
+%doc doc/{kadmin,krb5-protocol} doc/{api,implement,kadm5}/*.pdf
 %attr(755,root,root) %{_bindir}/krb5-config
 %attr(755,root,root) %{_libdir}/libdes425.so
 %attr(755,root,root) %{_libdir}/libgss*.so
@@ -961,6 +960,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120  2008/11/17 08:13:04  glen
+- simplify builddir
+
 Revision 1.119  2008/11/01 16:48:47  arekm
 BR: e2fsprogs for bindir/mk_cmds
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/krb5.spec?r1=1.119&r2=1.120&f=u



More information about the pld-cvs-commit mailing list