diff --git a/Bucardo-4.5.0.tar.gz.asc b/Bucardo-4.5.0.tar.gz.asc deleted file mode 100644 index 376780d..0000000 --- a/Bucardo-4.5.0.tar.gz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iEYEABEDAAYFAk/+/h8ACgkQvJuQZxSWSsgc6gCfYqJCFPT7vxYpXxRWcgFx2SmT -8LoAnjQ+kJMukyZKSHGF/++f6TF3lhQL -=Qcuh ------END PGP SIGNATURE----- diff --git a/bucardo.spec b/bucardo.spec index ad8467c..b9f6eb7 100644 --- a/bucardo.spec +++ b/bucardo.spec @@ -1,46 +1,45 @@ %define realname Bucardo Name: bucardo Version: 4.5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Postgres replication system for both multi-master and multi-slave operations - Group: Applications/Databases +# The README file says `same as Perl', however, I don't think it's +# what they meant. Reported as github#95. License: BSD URL: http://bucardo.org/ Source0: http://bucardo.org/downloads/Bucardo-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source1: Bucardo-%{version}.tar.gz.asc -Source2: master-master-replication-example.txt - - -BuildArch: noarch - -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(DBI) -BuildRequires: perl(DBD::Pg) +Source1: master-master-replication-example.txt +BuildArch: noarch +BuildRequires: postgresql-plperl +# Build +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +# Runtime +BuildRequires: perl(Config) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(DBD::Pg) >= 2.0 +BuildRequires: perl(DBI) >= 1.51 +BuildRequires: perl(DBIx::Safe) +BuildRequires: perl(Getopt::Long) BuildRequires: perl(IO::Handle) +BuildRequires: perl(Net::SMTP) +BuildRequires: perl(POSIX) +BuildRequires: perl(sigtrap) BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Sys::Syslog) -BuildRequires: perl(Net::SMTP) -# available from fedora 10 -BuildRequires: perl(DBIx::Safe) - -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(ExtUtils::MakeMaker) -Requires: postgresql-plperl - -Requires: perl(DBI) -Requires: perl(DBD::Pg) -Requires: perl(DBIx::Safe) -Requires: perl(IO::Handle) -Requires: perl(Sys::Hostname) -Requires: perl(Sys::Syslog) -Requires: perl(Net::SMTP) - -#testsuite -Requires: perl(Test::Simple) -Requires: perl(Test::Harness) +BuildRequires: perl(Time::HiRes) +BuildRequires: perl(vars) +# Tests only +BuildRequires: perl(base) +BuildRequires: perl(Cwd) +BuildRequires: perl(Exporter) +BuildRequires: perl(lib) +BuildRequires: perl(Test::More) +Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) +Requires: postgresql-plperl %description Bucardo is an asynchronous PostgreSQL replication system, allowing for both @@ -50,51 +49,48 @@ primarily by Greg Sabino Mullane of End Point Corporation. %prep %setup -q -n %{realname}-%{version} - %build - -%{__perl} Makefile.PL INSTALLDIRS=vendor - +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 make %{?_smp_mflags} - %install -rm -rf $RPM_BUILD_ROOT - -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} + -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; - -sed -i -e '1d;2i#!/usr/bin/perl' bucardo_ctl - -rm -f $RPM_BUILD_ROOT/%{_bindir}/bucardo_ctl -install -Dp -m 755 bucardo_ctl $RPM_BUILD_ROOT/%{_sbindir}/bucardo_ctl -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/bucardo - -install -Dp -m 644 %{SOURCE2} . - - - -%{_fixperms} %{buildroot} - -%clean -rm -rf $RPM_BUILD_ROOT - +make pure_install DESTDIR=%{buildroot} +sed -i -e '1d;2i#!%{__perl}' %{name}_ctl +rm -f %{buildroot}/%{_bindir}/%{name}_ctl +install -Dp -m755 bucardo_ctl %{buildroot}/%{_sbindir}/%{name}_ctl +install -Dp -m644 %{name}.schema %{buildroot}/%{_datadir}/%{name}/%{name}.schema +mkdir -p %{buildroot}/%{_localstatedir}/run/%{name} +install -Dp -m644 %{SOURCE1} . +%{_fixperms} %{buildroot}/ + +%check +# This test runs forever, it'd be nice to figure out why, +# fix it and re-enable it. For now, run the rest of the +# test suite at least. +rm -f t/15-star.t +make test %files -%defattr(-,root,root,-) -%doc bucardo_ctl.html Bucardo.pm.html Changes -%doc INSTALL LICENSE README SIGNATURE TODO +%license LICENSE +%doc *.html Changes INSTALL README TODO %doc master-master-replication-example.txt %{perl_vendorlib}/* %{_mandir}/man1/* %{_mandir}/man3/* -%{_sbindir}/bucardo_ctl -%{_datadir}/bucardo/bucardo.schema -%dir %{_localstatedir}/run/bucardo +%{_sbindir}/%{name}_ctl +%{_datadir}/%{name} +%dir %{_localstatedir}/run/%{name} %changelog +* Mon May 25 2015 Petr Ĺ abata - 4.5.0-9 +- Fix the FTBFS issue (#1158368) +- Install the missing database schema +- Clean and modernize the spec file +- Drop the unused signature file +- Fix the dep list +- Install the LICENSE file with %%license +- Enable test suite + * Thu Aug 28 2014 Jitka Plesnikova - 4.5.0-8 - Perl 5.20 rebuild