On the inclusion of cyrus-imapd

Paul Iadonisi pri.rhl1 at iadonisi.to
Sat Jul 26 06:27:44 UTC 2003


On Sat, 2003-07-26 at 01:05, Paul Iadonisi wrote:

[snip]

>   So I gave an 'rpmbuild --rebuild' on severn and it failed.  It builds

  Got it.  It's the perlhack stuff which appears to not be necessary
anymore.  The workarounds Simon has in the spec file would have worked
except that the %{buildroot} portion is no longer necessary in the
PREFIX value of the make install command, either.  The 2.1.14-4 package
failed with the same problem.  If anyone else is interested, attached
are two patches, one for the beta (2.2.1-2) and one for the stable
(2.1.14-4) spec files.
  And for reference, Simon's rpms are available at
http://home.teleport.ch/simix/
-- 
-Paul Iadonisi
 Senior System Administrator
 Red Hat Certified Engineer / Local Linux Lobbyist
 Ever see a penguin fly?  --  Try Linux.
 GPL all the way: Sell services, don't lease secrets
-------------- next part --------------
--- cyrus-imapd.spec	2003-07-08 18:22:06.000000000 -0400
+++ cyrus-imapd.spec.fixed	2003-07-26 02:22:00.000000000 -0400
@@ -58,6 +58,8 @@
 %define			_dbver %(eval "rpm -q --quiet db4 && echo db4 || echo db3")
 # Do we need the perl install hack for RedHat > 7.3 ?
 %define			_perlhack %(eval [ %{_rhver} = "6.2" -o %{_rhver} = "7.0" -o %{_rhver} = "7.1" -o %{_rhver} = "7.2" -o %{_rhver} = "7.3" -o %{_rhver} = "2.1AS" -o %{_rhver} = "2.1ES" ] && echo 0 || echo 1)
+# Do we need the perl make install hack for RedHat 9.0.93 (severn)
+%define			_perlmakehack %(eval [ %{_rhver} = "9.0.93" ] && echo 0 || echo 1)
 # Do we need the snmpargs patch (needed on RedHat 6.2)
 %define			_snmpargs_patch %(eval [ %{_rhver} = "6.2" ] && echo 1 || echo 0)
 %define			_perl_man3dir %(eval "$(perl -V:man3dir)"; echo $man3dir)
@@ -367,9 +369,15 @@
 popd
 %endif
 
+%if %{_perlmakehack}
 # Do what the regular make install does
 %{__make} install DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} mandir=%{_mandir}
 %{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} mandir=%{_mandir}
+%else
+# Do what the regular make install does
+%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
+%{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
+%endif
 
 %if %{DEL_WRAP}
 %{__install} -s -m 2755 deliver-wrapper	%{buildroot}%{_cyrexecdir}/
-------------- next part --------------
--- cyrus-imapd-BETA.spec	2003-07-25 20:07:18.000000000 -0400
+++ cyrus-imapd-BETA.spec.fixed	2003-07-26 02:09:57.000000000 -0400
@@ -55,6 +55,8 @@
 %define			_dbver %(eval "rpm -q --quiet db4 && echo db4 || echo db3")
 # Do we need the perl install hack for RedHat > 7.3 ?
 %define			_perlhack %(eval [ %{_rhver} = "6.2" -o %{_rhver} = "7.0" -o %{_rhver} = "7.1" -o %{_rhver} = "7.2" -o %{_rhver} = "7.3" -o %{_rhver} = "2.1AS" -o %{_rhver} = "2.1ES" ] && echo 0 || echo 1)
+# Do we need the perl make install hack for RedHat = 9.0.93 (severn)
+%define			_perlmakehack %(eval [ %{_rhver} = "9.0.93" ] && echo 0 || echo 1)
 # Do we need the snmpargs patch (needed on RedHat 6.2)
 %define			_snmpargs_patch %(eval [ %{_rhver} = "6.2" ] && echo 1 || echo 0)
 %define			_perl_man3dir %(eval "$(perl -V:man3dir)"; echo $man3dir)
@@ -351,6 +353,7 @@
 %install
 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
 
+echo %{_rhver} %{_perlhack} > /tmp/rhver.perlhack
 # This hack is needed on RedHat > 7.3 to install the perl files correctly
 %if %{_perlhack}
 pushd perl/imap
@@ -361,9 +364,15 @@
 popd
 %endif
 
+%if %{_perlmakehack}
 # Do what the regular make install does
 %{__make} install DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} mandir=%{_mandir}
 %{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} mandir=%{_mandir}
+%else
+# Do what the regular make install does
+%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
+%{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
+%endif
 
 %if %{DEL_WRAP}
 %{__install} -s -m 2755 deliver-wrapper	%{buildroot}%{_cyrexecdir}/


More information about the fedora-devel-list mailing list