Further work.

Properly build the Perl modules
Start cleaning up the file lists.
This commit is contained in:
Jason Tibbitts 2016-11-23 17:59:00 -06:00
parent 95c4f40167
commit 26a5a53fdc

View File

@ -142,11 +142,20 @@ autoreconf -vi
--enable-replication \ --enable-replication \
--enable-unit-tests \ --enable-unit-tests \
# The configure script will set up the Perl makefiles, but not in the way
# Fedora needs them. So regenerate them manually.
for i in perl/annotator perl/imap perl/sieve/managesieve; do
pushd $i
perl Makefile.PL INSTALLDIRS=vendor # NO_PERLOCAL=1 NO_PACKLIST=1
popd
done
%make_build %make_build
# This isn't built by default, but this package has always installed it. # This isn't built by default, but this package has always installed it.
make notifyd/notifytest make notifyd/notifytest
# Also not built by default, but the tools are needed for serving timezone info
make -C tools/vzic make -C tools/vzic
#make -C man -f Makefile.dist #make -C man -f Makefile.dist
@ -168,14 +177,6 @@ install -d \
%buildroot/%_datadir/%name/rpm \ %buildroot/%_datadir/%name/rpm \
%buildroot/etc/pki/%name %buildroot/etc/pki/%name
# This is needed to install the perl files correctly
#pushd perl/imap
# perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
#popd
#pushd perl/sieve/managesieve
# perl Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
#popd
# Do what the regular make install does # Do what the regular make install does
#make install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir} #make install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
#make -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir} #make -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
@ -257,9 +258,9 @@ do
done done
# Remove installed but not packaged files # Remove installed but not packaged files
rm %{buildroot}%{cyrexecdir}/pop3proxyd rm %buildroot/%cyrexecdir/pop3proxyd
find %{buildroot} -name "perllocal.pod" -exec rm {} \; find %buildroot -name "perllocal.pod" -exec rm {} \;
find %{buildroot} -name ".packlist" -exec rm {} \; find %buildroot -name ".packlist" -exec rm {} \;
#find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec rm {} \; #find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec rm {} \;
@ -324,65 +325,82 @@ fi
%config(noreplace) /etc/pam.d/nntp %config(noreplace) /etc/pam.d/nntp
/etc/cron.daily/%{name} /etc/cron.daily/%{name}
%{_unitdir}/cyrus-imapd.service %{_unitdir}/cyrus-imapd.service
%dir %{cyrexecdir} %dir %cyrexecdir
%{cyrexecdir}/cyr_systemd_helper %cyrexecdir/cyr_systemd_helper
%{cyrexecdir}/arbitron %cyrexecdir/arbitron
%{cyrexecdir}/arbitronsort.pl %cyrexecdir/arbitronsort.pl
%{cyrexecdir}/chk_cyrus
%{cyrexecdir}/convert-sieve.pl %cyrexecdir/chk_cyrus
%{cyrexecdir}/cyr_df %cyrexecdir/convert-sieve.pl
%{cyrexecdir}/ctl_cyrusdb
%{cyrexecdir}/ctl_deliver %cyrexecdir/ctl_cyrusdb
%{cyrexecdir}/ctl_mboxlist %cyrexecdir/ctl_deliver
%{cyrexecdir}/cvt_cyrusdb %cyrexecdir/ctl_mboxlist
%{cyrexecdir}/cyr_dbtool %cyrexecdir/ctl_zoneinfo
%{cyrexecdir}/cyr_expire
%{cyrexecdir}/cyr_sequence %cyrexecdir/cvt_cyrusdb
%{cyrexecdir}/cyr_synclog %cyrexecdir/cvt_cyrusdb_all
%{cyrexecdir}/cyr_userseen
%{cyrexecdir}/cyrdump %cyrexecdir/cyr_dbtool
%{cyrexecdir}/cyrus-master %cyrexecdir/cyr_deny
%{cyrexecdir}/deliver %cyrexecdir/cyr_df
%{cyrexecdir}/dohash %cyrexecdir/cyr_expire
%{cyrexecdir}/fud %cyrexecdir/cyr_info
%{cyrexecdir}/imapd %cyrexecdir/cyr_sequence
%{cyrexecdir}/ipurge %cyrexecdir/cyr_synclog
%{cyrexecdir}/lmtpd %cyrexecdir/cyr_userseen
%{cyrexecdir}/lmtpproxyd
%{cyrexecdir}/masssievec %cyrexecdir/cyrdump
%{cyrexecdir}/mbexamine %cyrexecdir/cyrus-master
%{cyrexecdir}/mbpath %cyrexecdir/dav_reconstruct
%{cyrexecdir}/migrate-metadata %cyrexecdir/deliver
%{cyrexecdir}/mkimap %cyrexecdir/dohash
%{cyrexecdir}/mknewsgroups %cyrexecdir/fud
%{cyrexecdir}/notifyd %cyrexecdir/httpd
%{cyrexecdir}/pop3d %cyrexecdir/imapd
%{cyrexecdir}/quota %cyrexecdir/ipurge
%{cyrexecdir}/reconstruct %cyrexecdir/lmtpd
%{cyrexecdir}/rehash %cyrexecdir/lmtpproxyd
%{cyrexecdir}/sievec %cyrexecdir/masssievec
%{cyrexecdir}/sieved %cyrexecdir/mbexamine
%{cyrexecdir}/smmapd %cyrexecdir/mbpath
%{cyrexecdir}/squatter %cyrexecdir/mbtool
%{cyrexecdir}/timsieved %cyrexecdir/migrate-metadata
%{cyrexecdir}/tls_prune %cyrexecdir/mkimap
%{cyrexecdir}/translatesieve %cyrexecdir/mknewsgroups
%{cyrexecdir}/undohash %cyrexecdir/notifyd
%{cyrexecdir}/unexpunge %cyrexecdir/pop3d
%{cyrexecdir}/upgradesieve %cyrexecdir/quota
%{cyrexecdir}/cvt_cyrusdb_all %cyrexecdir/reconstruct
%{cyrexecdir}/idled %cyrexecdir/rehash
%{cyrexecdir}/mupdate %cyrexecdir/sievec
%{cyrexecdir}/mupdate-loadgen.pl %cyrexecdir/sieved
%{cyrexecdir}/proxyd %cyrexecdir/smmapd
%{cyrexecdir}/sync_client %cyrexecdir/squatter
%{cyrexecdir}/sync_reset %cyrexecdir/timsieved
%{cyrexecdir}/sync_server %cyrexecdir/tls_prune
%{cyrexecdir}/cyrfetchnews %cyrexecdir/translatesieve
%{cyrexecdir}/nntpd %cyrexecdir/undohash
%{cyrexecdir}/ptdump %cyrexecdir/unexpunge
%{cyrexecdir}/ptexpire %cyrexecdir/upgradesieve
%{cyrexecdir}/ptloader %cyrexecdir/idled
%cyrexecdir/mupdate
%cyrexecdir/mupdate-loadgen.pl
%cyrexecdir/proxyd
%cyrexecdir/sync_client
%cyrexecdir/sync_reset
%cyrexecdir/sync_server
%cyrexecdir/cyrfetchnews
%cyrexecdir/nntpd
%cyrexecdir/ptdump
%cyrexecdir/ptexpire
%cyrexecdir/ptloader
%{cyrexecdir}/vzic
%{cyrexecdir}/vzic-dump.pl
%{cyrexecdir}/vzic-merge.pl
%{cyrexecdir}/vzic-test.pl
%attr(0750,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap %attr(0750,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap
%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/backup %attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/backup
%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/db %attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/db
@ -417,26 +435,10 @@ fi
%doc perl/imap/Changes %doc perl/imap/Changes
%doc perl/imap/examples %doc perl/imap/examples
%{_bindir}/* %{_bindir}/*
%dir %{perl_vendorarch}/Cyrus %{perl_vendorarch}/auto/Cyrus
%dir %{perl_vendorarch}/Cyrus/IMAP %{perl_vendorarch}/Cyrus
%{perl_vendorarch}/Cyrus/IMAP/Admin.pm %{perl_vendorlib}/Cyrus
%{perl_vendorarch}/Cyrus/IMAP/Shell.pm %{_mandir}/man3/*.3pm*
%{perl_vendorarch}/Cyrus/IMAP/IMSP.pm
%{perl_vendorarch}/Cyrus/IMAP.pm
%dir %{perl_vendorarch}/Cyrus/SIEVE
%{perl_vendorarch}/Cyrus/SIEVE/managesieve.pm
%dir %{perl_vendorarch}/auto
%dir %{perl_vendorarch}/auto/Cyrus
%dir %{perl_vendorarch}/auto/Cyrus/IMAP
%{perl_vendorarch}/auto/Cyrus/IMAP/IMAP.so
%dir %{perl_vendorarch}/auto/Cyrus/SIEVE
%dir %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
%{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.so
%{_mandir}/man3/Cyrus::IMAP::Admin.3pm*
%{_mandir}/man3/Cyrus::IMAP::Shell.3pm*
%{_mandir}/man3/Cyrus::IMAP.3pm*
%{_mandir}/man3/Cyrus::IMAP::IMSP.3pm*
%{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm*
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog