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-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
# This isn't built by default, but this package has always installed it.
make notifyd/notifytest
# Also not built by default, but the tools are needed for serving timezone info
make -C tools/vzic
#make -C man -f Makefile.dist
@ -168,14 +177,6 @@ install -d \
%buildroot/%_datadir/%name/rpm \
%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
#make install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
#make -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
@ -257,9 +258,9 @@ do
done
# Remove installed but not packaged files
rm %{buildroot}%{cyrexecdir}/pop3proxyd
find %{buildroot} -name "perllocal.pod" -exec rm {} \;
find %{buildroot} -name ".packlist" -exec rm {} \;
rm %buildroot/%cyrexecdir/pop3proxyd
find %buildroot -name "perllocal.pod" -exec rm {} \;
find %buildroot -name ".packlist" -exec rm {} \;
#find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec rm {} \;
@ -324,65 +325,82 @@ fi
%config(noreplace) /etc/pam.d/nntp
/etc/cron.daily/%{name}
%{_unitdir}/cyrus-imapd.service
%dir %{cyrexecdir}
%{cyrexecdir}/cyr_systemd_helper
%{cyrexecdir}/arbitron
%{cyrexecdir}/arbitronsort.pl
%{cyrexecdir}/chk_cyrus
%{cyrexecdir}/convert-sieve.pl
%{cyrexecdir}/cyr_df
%{cyrexecdir}/ctl_cyrusdb
%{cyrexecdir}/ctl_deliver
%{cyrexecdir}/ctl_mboxlist
%{cyrexecdir}/cvt_cyrusdb
%{cyrexecdir}/cyr_dbtool
%{cyrexecdir}/cyr_expire
%{cyrexecdir}/cyr_sequence
%{cyrexecdir}/cyr_synclog
%{cyrexecdir}/cyr_userseen
%{cyrexecdir}/cyrdump
%{cyrexecdir}/cyrus-master
%{cyrexecdir}/deliver
%{cyrexecdir}/dohash
%{cyrexecdir}/fud
%{cyrexecdir}/imapd
%{cyrexecdir}/ipurge
%{cyrexecdir}/lmtpd
%{cyrexecdir}/lmtpproxyd
%{cyrexecdir}/masssievec
%{cyrexecdir}/mbexamine
%{cyrexecdir}/mbpath
%{cyrexecdir}/migrate-metadata
%{cyrexecdir}/mkimap
%{cyrexecdir}/mknewsgroups
%{cyrexecdir}/notifyd
%{cyrexecdir}/pop3d
%{cyrexecdir}/quota
%{cyrexecdir}/reconstruct
%{cyrexecdir}/rehash
%{cyrexecdir}/sievec
%{cyrexecdir}/sieved
%{cyrexecdir}/smmapd
%{cyrexecdir}/squatter
%{cyrexecdir}/timsieved
%{cyrexecdir}/tls_prune
%{cyrexecdir}/translatesieve
%{cyrexecdir}/undohash
%{cyrexecdir}/unexpunge
%{cyrexecdir}/upgradesieve
%{cyrexecdir}/cvt_cyrusdb_all
%{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
%dir %cyrexecdir
%cyrexecdir/cyr_systemd_helper
%cyrexecdir/arbitron
%cyrexecdir/arbitronsort.pl
%cyrexecdir/chk_cyrus
%cyrexecdir/convert-sieve.pl
%cyrexecdir/ctl_cyrusdb
%cyrexecdir/ctl_deliver
%cyrexecdir/ctl_mboxlist
%cyrexecdir/ctl_zoneinfo
%cyrexecdir/cvt_cyrusdb
%cyrexecdir/cvt_cyrusdb_all
%cyrexecdir/cyr_dbtool
%cyrexecdir/cyr_deny
%cyrexecdir/cyr_df
%cyrexecdir/cyr_expire
%cyrexecdir/cyr_info
%cyrexecdir/cyr_sequence
%cyrexecdir/cyr_synclog
%cyrexecdir/cyr_userseen
%cyrexecdir/cyrdump
%cyrexecdir/cyrus-master
%cyrexecdir/dav_reconstruct
%cyrexecdir/deliver
%cyrexecdir/dohash
%cyrexecdir/fud
%cyrexecdir/httpd
%cyrexecdir/imapd
%cyrexecdir/ipurge
%cyrexecdir/lmtpd
%cyrexecdir/lmtpproxyd
%cyrexecdir/masssievec
%cyrexecdir/mbexamine
%cyrexecdir/mbpath
%cyrexecdir/mbtool
%cyrexecdir/migrate-metadata
%cyrexecdir/mkimap
%cyrexecdir/mknewsgroups
%cyrexecdir/notifyd
%cyrexecdir/pop3d
%cyrexecdir/quota
%cyrexecdir/reconstruct
%cyrexecdir/rehash
%cyrexecdir/sievec
%cyrexecdir/sieved
%cyrexecdir/smmapd
%cyrexecdir/squatter
%cyrexecdir/timsieved
%cyrexecdir/tls_prune
%cyrexecdir/translatesieve
%cyrexecdir/undohash
%cyrexecdir/unexpunge
%cyrexecdir/upgradesieve
%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(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/backup
%attr(0700,%{cyrususer},%{cyrusgroup}) %dir %{_var}/lib/imap/db
@ -417,26 +435,10 @@ fi
%doc perl/imap/Changes
%doc perl/imap/examples
%{_bindir}/*
%dir %{perl_vendorarch}/Cyrus
%dir %{perl_vendorarch}/Cyrus/IMAP
%{perl_vendorarch}/Cyrus/IMAP/Admin.pm
%{perl_vendorarch}/Cyrus/IMAP/Shell.pm
%{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*
%{perl_vendorarch}/auto/Cyrus
%{perl_vendorarch}/Cyrus
%{perl_vendorlib}/Cyrus
%{_mandir}/man3/*.3pm*
%{_mandir}/man1/*
%changelog