diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index 9af1b24..c8beb0f 100644 --- a/Alien/Package/Rpm.pm +++ b/Alien/Package/Rpm.pm @@ -255,18 +255,26 @@ sub prep { print OUT "\%define _rpmdir ../\n"; # write rpm to current directory print OUT "\%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm\n"; print OUT "\n"; - print OUT "\%pre\n"; - print OUT $this->preinst."\n"; - print OUT "\n"; - print OUT "\%post\n"; - print OUT $this->postinst."\n"; - print OUT "\n"; - print OUT "\%preun\n"; - print OUT $this->prerm."\n"; - print OUT "\n"; - print OUT "\%postun\n"; - print OUT $this->postrm."\n"; - print OUT "\n"; + if ($this->preinst) { + print OUT "\%pre\n"; + print OUT $this->preinst."\n"; + print OUT "\n"; + } + if ($this->postinst) { + print OUT "\%post\n"; + print OUT $this->postinst."\n"; + print OUT "\n"; + } + if ($this->prerm) { + print OUT "\%preun\n"; + print OUT $this->prerm."\n"; + print OUT "\n"; + } + if ($this->postun) { + print OUT "\%postun\n"; + print OUT $this->postrm."\n"; + print OUT "\n"; + } print OUT "\%description\n"; print OUT $this->description."\n"; print OUT "\n"; diff --git a/debian/changelog b/debian/changelog index 4990a50..0c22c50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +alien (7.12) unstable; urgency=low + + * Modified Rpm.pm to not bother with the scripts stanzas if there are + no scripts. + + -- Joey Hess Fri, 8 Dec 2000 14:50:51 -0800 + alien (7.11) unstable; urgency=low * Use ls -1 instead of plain ls when copying files to debian/tmp in rpm