byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rpm packaging (#276)

Browse Source 
* Fix rogue date in spec file Changelog

* Update rpm spec file to match changed README file names

* Don't exclude files matching pattern 'ConfigServer'

* Exclude README.selinux from apache file list - it's included explicitly in the %files section

* cosmetic fixups to bash code in rpm spec file (mostly indentation)

* Update rpm specfile changelog
This commit is contained in:
Robin Bowes 2016-12-27 18:17:18 +00:00 committed by Matt Simerson
parent d00a82d8e8
commit 83b6aafc1d
1 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packaging/rpm/qpsmtpd.spec.in
View File

@ -65,12 +65,10 @@ rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
eval `perl '-V:installarchlib'` eval `perl '-V:installarchlib'`
mkdir -p $RPM_BUILD_ROOT/$installarchlib mkdir -p $RPM_BUILD_ROOT/$installarchlib
if grep -q DESTDIR Makefile if grep -q DESTDIR Makefile ; then
then
make DESTDIR=$RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT
find blib/lib -name '*.pm.*' -exec rm -f {} \; find blib/lib -name '*.pm.*' -exec rm -f {} \;
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
else else
make PREFIX=$RPM_BUILD_ROOT/usr make PREFIX=$RPM_BUILD_ROOT/usr
find blib/lib -name '*.pm.*' -exec rm -f {} \; find blib/lib -name '*.pm.*' -exec rm -f {} \;
@ -110,7 +108,6 @@ find ${RPM_BUILD_ROOT}%{_prefix} -type f -print | \
grep -v in\\.qpsmtpd | \ grep -v in\\.qpsmtpd | \
grep -v /Apache | \ grep -v /Apache | \
grep -v /Danga | \ grep -v /Danga | \
grep -v ConfigServer | \
grep -v Qpsmtpd/PollServer.pm > %{name}-%{version}-%{release}-filelist grep -v Qpsmtpd/PollServer.pm > %{name}-%{version}-%{release}-filelist
if [ "$(cat %{name}-%{version}-%{release}-filelist)X" = "X" ] ; then if [ "$(cat %{name}-%{version}-%{release}-filelist)X" = "X" ] ; then
echo "ERROR: EMPTY FILE LIST" echo "ERROR: EMPTY FILE LIST"
@ -121,8 +118,8 @@ find ${RPM_BUILD_ROOT}%{_prefix} -type f -print | \
sed "s@^$RPM_BUILD_ROOT@@g" | \ sed "s@^$RPM_BUILD_ROOT@@g" | \
grep -v [Aa]sync | \ grep -v [Aa]sync | \
grep -v packaging | \ grep -v packaging | \
grep -v README.selinux | \
grep -v /Danga | \ grep -v /Danga | \
grep -v ConfigServer | \
grep -v Qpsmtpd/PollServer.pm | cat - %{name}-%{version}-%{release}-filelist | sort | uniq -u > %{name}-%{version}-%{release}-apache-filelist grep -v Qpsmtpd/PollServer.pm | cat - %{name}-%{version}-%{release}-filelist | sort | uniq -u > %{name}-%{version}-%{release}-apache-filelist
if [ "$(cat %{name}-%{version}-%{release}-apache-filelist)X" = "X" ] ; then if [ "$(cat %{name}-%{version}-%{release}-apache-filelist)X" = "X" ] ; then
echo "ERROR: EMPTY FILE LIST" echo "ERROR: EMPTY FILE LIST"
@ -131,7 +128,7 @@ fi
%files -f %{name}-%{version}-%{release}-filelist %files -f %{name}-%{version}-%{release}-filelist
%defattr(-,root,root) %defattr(-,root,root)
%doc CREDITS Changes LICENSE README README.plugins STATUS %doc CREDITS Changes LICENSE README.md README.plugins.md STATUS
%{_initrddir}/qpsmtpd-forkserver %{_initrddir}/qpsmtpd-forkserver
%config(noreplace) %{_sysconfdir}/qpsmtpd/* %config(noreplace) %{_sysconfdir}/qpsmtpd/*
%config(noreplace) %{_sysconfdir}/sysconfig/qpsmtpd-forkserver %config(noreplace) %{_sysconfdir}/sysconfig/qpsmtpd-forkserver
@ -149,11 +146,9 @@ fi
%{_sbindir}/in.qpsmtpd %{_sbindir}/in.qpsmtpd
%pre %pre
if ! id smtpd >/dev/null 2>&1 if ! id smtpd >/dev/null 2>&1 ; then
then
# need to create smtpd user. # need to create smtpd user.
if perl -e 'exit ! defined(getgrnam("postdrop"))' if perl -e 'exit ! defined(getgrnam("postdrop"))' ; then
then
# if postfix is installed, we will probably use # if postfix is installed, we will probably use
# queue/postfix, which will need this: # queue/postfix, which will need this:
supp="-G postdrop" supp="-G postdrop"
@ -162,6 +157,9 @@ then
fi fi
%changelog %changelog
* Tue Dec 27 2016 <robin.bowes@yo61.com> 0.96-1
- Fixed up spec file to build cleanly with 0.96
* Fri Oct 14 2011 <richard.siddall@elirion.net> 0.84-1 * Fri Oct 14 2011 <richard.siddall@elirion.net> 0.84-1
- Removed rpm/files/qpsmtpd-plugin-file_connection as there's a - Removed rpm/files/qpsmtpd-plugin-file_connection as there's a
newer version in plugins/logging/file newer version in plugins/logging/file
@ -254,7 +252,7 @@ newer version in plugins/logging/file
- (Thanks to Josko Plazonic for the reporting these problems and - (Thanks to Josko Plazonic for the reporting these problems and
suggesting fixes) suggesting fixes)
* Tue Nov 30 2005 <hjp@hjp.at> 0.31.1-2 * Wed Nov 30 2005 <hjp@hjp.at> 0.31.1-2
- Revision 170 of plugins/loggin/file_connection: - Revision 170 of plugins/loggin/file_connection:
Return DECLINED from open_log. Return DECLINED from open_log.
Open log in write_log if it isn't already open. Open log in write_log if it isn't already open.