- drop obsolete and outdated manual inclusion of rpm macros

[packages/Perlbal.git] / Perlbal.spec

diff --git a/Perlbal.spec b/Perlbal.spec
index 49a4e0b82b151826056f6fc1e699c43fd2485d55..4605bc4bd39785ebdbddbb3a8d19f5f5267ea9df 100644 (file)
--- a/Perlbal.spec
+++ b/Perlbal.spec
@@ -1,38 +1,42 @@
+# TODO
+# - split perl-devel for Devel::Peek?

 #
 # Conditional build:
 %bcond_without autodeps        # don't BR packages needed only for resolving deps
 #
 # Conditional build:
 %bcond_without autodeps        # don't BR packages needed only for resolving deps

-%bcond_without tests           # do not perform "make test"
+%bcond_without tests           # perform "make test"

 #
 #

-%include       /usr/lib/rpm/macros.perl

 Summary:       Perlbal - Reverse-proxy load balancer and webserver
 Summary:       Perlbal - Reverse-proxy load balancer and webserver

-#Summary(pl.UTF-8):    
+Summary(pl.UTF-8):     Perlbal - odwrotne proxy z równoważeniem obciążenia oraz serwer WWW

 Name:          Perlbal
 Name:          Perlbal

-Version:       1.59
-Release:       2
+Version:       1.79
+Release:       1

 # same as perl
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 # same as perl
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl

-Source0:       http://www.cpan.org/modules/by-authors/id/B/BR/BRADFITZ/Perlbal-%{version}.tar.gz
-# Source0-md5: 7d098abd4434b70f13638cdff3e2383a
+Source0:       http://www.cpan.org/modules/by-authors/id/D/DO/DORMANDO/%{name}-%{version}.tar.gz
+# Source0-md5: 565ba843bd3b8b38287e20eceab62fe5

 Source1:       perlbal.init
 Source2:       perlbal.sysconfig
 Patch0:                %{name}-no_use_lib.patch
 Source1:       perlbal.init
 Source2:       perlbal.sysconfig
 Patch0:                %{name}-no_use_lib.patch

-Patch1:                %{name}-test_15_webserver.patch
+Patch2:                perlbal-freeport.patch

 URL:           http://www.danga.com/perlbal/
 URL:           http://www.danga.com/perlbal/

-Requires(post,preun):  /sbin/chkconfig
-BuildRequires: rpmbuild(macros) >= 1.228

 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13

+BuildRequires: rpmbuild(macros) >= 1.228

 %if %{with autodeps} || %{with tests}
 BuildRequires: perl-BSD-Resource
 BuildRequires: perl-Danga-Socket >= 1.44
 %if %{with autodeps} || %{with tests}
 BuildRequires: perl-BSD-Resource
 BuildRequires: perl-Danga-Socket >= 1.44

+BuildRequires: perl-IO-AIO
+BuildRequires: perl-Net-Netmask

 BuildRequires: perl-Sys-Syscall
 BuildRequires: perl-libwww
 %endif
 BuildRequires: perl-Sys-Syscall
 BuildRequires: perl-libwww
 %endif

+Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts

 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define        _noautoreq      'perl(Perlbal.*)'
+%define                _noautoreq      'perl(Perlbal.*)'

 
 %description
 Perlbal is a single-threaded event-based server supporting HTTP load
 
 %description
 Perlbal is a single-threaded event-based server supporting HTTP load


@@ -40,24 +44,36 @@ balancing, web serving, and a mix of the two.
 
 One of the defining things about Perlbal is that almost everything can
 be configured or reconfigured on the fly without needing to restart
 
 One of the defining things about Perlbal is that almost everything can
 be configured or reconfigured on the fly without needing to restart

-the software. A basic configuration file containing a management
-port enables you to easily perform operations on a running instance
-of Perlbal.
+the software. A basic configuration file containing a management port
+enables you to easily perform operations on a running instance of
+Perlbal.

 
 

-# %description -l pl.UTF-8
-# TODO
+%description -l pl.UTF-8
+Perlbal to jednowątkowy, oparty na zdarzeniach serwer obsługujący
+równoważenie obciążenia HTTP, świadczenie usług WWW oraz połączenie
+obu.
+
+Jedną z cech charakterystycznych dla Perlbala jest to, że prawie
+wszystko można skonfigurować lub przekonfigurować w locie, bez
+potrzeby restartu programu. Podstawowy plik konfiguracyjny zawierający
+port zarządzający pozwala na łatwe wykonywanie operacji na działającej
+instancji Perlbala.

 
 %prep
 %setup -q
 %patch0 -p1
 
 %prep
 %setup -q
 %patch0 -p1

-%patch1 -p1
+%patch2 -p1

 
 %build
 %{__perl} Makefile.PL \
        INSTALLDIRS=vendor
 %{__make}
 
 
 %build
 %{__perl} Makefile.PL \
        INSTALLDIRS=vendor
 %{__make}
 

-%{?with_tests:%{__make} test}
+%if %{with tests}
+# randomize the first base port a little
+export TEST_TCP_FREE_PORT=$(perl -e 'print (4096 + $$) % 65536')
+%{__make} test
+%endif

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -68,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/perlbal
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/perlbal
 cp -r conf $RPM_BUILD_ROOT%{_sysconfdir}/perlbal
 install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/perlbal
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/perlbal
 cp -r conf $RPM_BUILD_ROOT%{_sysconfdir}/perlbal

+rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Perlbal/.packlist

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -85,11 +102,12 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc CHANGES doc conf
 %files
 %defattr(644,root,root,755)
 %doc CHANGES doc conf

-%{perl_vendorlib}/*.pm
-%{perl_vendorlib}/Perlbal/
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man?/*
+%dir %{_sysconfdir}/perlbal
+%attr(640,root,root) %{_sysconfdir}/perlbal/*.conf
+%attr(640,root,root) %{_sysconfdir}/perlbal/*.dat

 %attr(754,root,root) /etc/rc.d/init.d/perlbal
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/perlbal
 %attr(754,root,root) /etc/rc.d/init.d/perlbal
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/perlbal

-%dir %{_sysconfdir}/perlbal
-%attr(740,root,root) %{_sysconfdir}/perlbal/*
+%attr(755,root,root) %{_bindir}/perlbal
+%{perl_vendorlib}/*.pm
+%{perl_vendorlib}/Perlbal
+%{_mandir}/man?/*