From ea71ef93b2f0530fa627a4b7165dc0c1594e62a1 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Aug 06 2013 14:29:52 +0000 Subject: Used unversioned doc directory Resolves: rhbz#994090 --- diff --git a/sendmail.spec b/sendmail.spec index 9112126..6d55041 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -23,7 +23,7 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail Version: 8.14.7 -Release: 3%{?dist} +Release: 4%{?dist} License: Sendmail Group: System Environment/Daemons URL: http://www.sendmail.org/ @@ -314,9 +314,9 @@ rm -rf %{buildroot} # create directories for d in %{_bindir} %{_sbindir} %{_includedir}/libmilter \ %{_libdir} %{_mandir}/man{1,5,8} %{maildir} %{stdir} %{spooldir} \ - %{_docdir}/sendmail-%{version} %{sendmailcf} %{_sysconfdir}/smrsh\ + %{_docdir}/sendmail %{sendmailcf} %{_sysconfdir}/smrsh\ %{spooldir}/clientmqueue %{_sysconfdir}/sysconfig %{_initrddir} \ - %{_sysconfdir}/pam.d %{_docdir}/sendmail-%{version}/contrib \ + %{_sysconfdir}/pam.d %{_docdir}/sendmail/contrib \ %{_sysconfdir}/NetworkManager/dispatcher.d do install -m 755 -d %{buildroot}$d @@ -367,21 +367,21 @@ done ln -sf ../sbin/sendmail.sendmail %{buildroot}/usr/lib/sendmail.sendmail # install docs for sendmail -install -p -m 644 FAQ %{buildroot}%{_docdir}/sendmail-%{version} -install -p -m 644 KNOWNBUGS %{buildroot}%{_docdir}/sendmail-%{version} -install -p -m 644 LICENSE %{buildroot}%{_docdir}/sendmail-%{version} -install -p -m 644 README %{buildroot}%{_docdir}/sendmail-%{version} -install -p -m 644 RELEASE_NOTES %{buildroot}%{_docdir}/sendmail-%{version} -gzip -9 %{buildroot}%{_docdir}/sendmail-%{version}/RELEASE_NOTES +install -p -m 644 FAQ %{buildroot}%{_docdir}/sendmail +install -p -m 644 KNOWNBUGS %{buildroot}%{_docdir}/sendmail +install -p -m 644 LICENSE %{buildroot}%{_docdir}/sendmail +install -p -m 644 README %{buildroot}%{_docdir}/sendmail +install -p -m 644 RELEASE_NOTES %{buildroot}%{_docdir}/sendmail +gzip -9 %{buildroot}%{_docdir}/sendmail/RELEASE_NOTES # install docs for sendmail-doc -install -m 644 doc/op/op.pdf %{buildroot}%{_docdir}/sendmail-%{version} -install -p -m 644 sendmail/README %{buildroot}%{_docdir}/sendmail-%{version}/README.sendmail -install -p -m 644 sendmail/SECURITY %{buildroot}%{_docdir}/sendmail-%{version} -install -p -m 644 smrsh/README %{buildroot}%{_docdir}/sendmail-%{version}/README.smrsh -install -p -m 644 libmilter/README %{buildroot}%{_docdir}/sendmail-%{version}/README.libmilter -install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf -install -p -m 644 contrib/* %{buildroot}%{_docdir}/sendmail-%{version}/contrib +install -m 644 doc/op/op.pdf %{buildroot}%{_docdir}/sendmail +install -p -m 644 sendmail/README %{buildroot}%{_docdir}/sendmail/README.sendmail +install -p -m 644 sendmail/SECURITY %{buildroot}%{_docdir}/sendmail +install -p -m 644 smrsh/README %{buildroot}%{_docdir}/sendmail/README.smrsh +install -p -m 644 libmilter/README %{buildroot}%{_docdir}/sendmail/README.libmilter +install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail/README.cf +install -p -m 644 contrib/* %{buildroot}%{_docdir}/sendmail/contrib # install the cf files for the sendmail-cf package. cp -ar cf/* %{buildroot}%{sendmailcf} @@ -580,12 +580,12 @@ fi %files %defattr(-,root,root,-) -%dir %{_docdir}/sendmail-%{version} -%doc %{_docdir}/sendmail-%{version}/FAQ -%doc %{_docdir}/sendmail-%{version}/KNOWNBUGS -%doc %{_docdir}/sendmail-%{version}/LICENSE -%doc %{_docdir}/sendmail-%{version}/README -%doc %{_docdir}/sendmail-%{version}/RELEASE_NOTES.gz +%dir %{_docdir}/sendmail +%doc %{_docdir}/sendmail/FAQ +%doc %{_docdir}/sendmail/KNOWNBUGS +%doc %{_docdir}/sendmail/LICENSE +%doc %{_docdir}/sendmail/README +%doc %{_docdir}/sendmail/RELEASE_NOTES.gz %{_bindir}/hoststat %{_bindir}/makemap %{_bindir}/purgestat @@ -687,25 +687,29 @@ fi %files milter %defattr(-,root,root,-) %doc LICENSE -%doc %{_docdir}/sendmail-%{version}/README.libmilter +%doc %{_docdir}/sendmail/README.libmilter %{_libdir}/libmilter.so.[0-9].[0-9] %{_libdir}/libmilter.so.[0-9].[0-9].[0-9] %files doc %defattr(-,root,root,-) -%{_docdir}/sendmail-%{version}/README.cf -%{_docdir}/sendmail-%{version}/README.sendmail -%{_docdir}/sendmail-%{version}/README.smrsh -%{_docdir}/sendmail-%{version}/SECURITY -%{_docdir}/sendmail-%{version}/op.pdf -%dir %{_docdir}/sendmail-%{version}/contrib -%attr(0644,root,root) %{_docdir}/sendmail-%{version}/contrib/* +%{_docdir}/sendmail/README.cf +%{_docdir}/sendmail/README.sendmail +%{_docdir}/sendmail/README.smrsh +%{_docdir}/sendmail/SECURITY +%{_docdir}/sendmail/op.pdf +%dir %{_docdir}/sendmail/contrib +%attr(0644,root,root) %{_docdir}/sendmail/contrib/* %files sysvinit %defattr(-,root,root,-) %{_initrddir}/sendmail %changelog +* Tue Aug 6 2013 Jaroslav Škarvada - 8.14.7-4 +- Used unversioned doc directory + Resolves: rhbz#994090 + * Fri Aug 2 2013 Jaroslav Škarvada - 8.14.7-3 - Rebuilt with -D_FILE_OFFSET_BITS=64 Related: rhbz#912785