- pl, missing dirs

Changed files:
    munin.spec -> 1.7

diff --git a/munin.spec b/munin.spec
index a1f798c5242713468964f91d4f20bff48fb5d3b7..ac6a16997b39635b8f55bcab22296887c3e7a440 100644 (file)
--- a/munin.spec
+++ b/munin.spec
@@ -1,5 +1,6 @@
 %include       /usr/lib/rpm/macros.perl
-Summary:       Munin is the Linpro RRD data agent
+Summary:       Munin - the Linpro RRD data agent
+Summary(pl):   Munin - agent danych RRD Linpro
 Name:          munin
 Version:       1.3.2
 Release:       0.1
@@ -22,19 +23,28 @@ Munin, formerly known as The Linpro RRD server, queries a number of
 nodes, and processes the data using RRDtool and presents it on web
 pages.
 
+%description -l pl
+Munin, znany poprzednio jako serwer RRD Linpro, odpytuje wiele wêz³ów
+i przetwarza dane przy u¿yciu RRDtoola, a nastêpnie prezentuje je na
+stronach WWW.
+
 %package node
 Summary:       Linpro RRD data agent
+Summary(pl):   Agent danych RRD Linpro
 Group:         Daemons
-Requires:      perl-Net-Server
 #Requires:     perl-Config-General
+Requires:      perl-Net-Server
 Requires:      procps >= 2.0.7
 Requires:      sysstat
-BuildArch:     noarch
 
 %description node
 The Munin node package returns statistical data on the request of a
 Munin server.
 
+%description node -l pl
+Pakiet Munin dla wêz³a zwraca dane statystyczne na ¿±danie serwera
+Munin.
+
 %prep
 %setup -q
 
@@ -44,9 +54,9 @@ Munin server.
 # Skip the PDFs.
 perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text|doc),# $&,' Makefile
 perl -pi -e 's,\$\(INSTALL.+\.(pdf|txt) \$\(DOCDIR,# $&,' Makefile
-%{__make}      clean
-%{__make}      CONFIG=dists/redhat/Makefile.config \
-       build
+%{__make} clean
+%{__make} build \
+       CONFIG=dists/redhat/Makefile.config
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,11 +67,11 @@ install -d $RPM_BUILD_ROOT/var/{lib,log}/munin
 install -d $RPM_BUILD_ROOT/var/www/html/munin
 
 ## Node
-%{__make}      CONFIG=dists/redhat/Makefile.config \
+%{__make} install \
+       CONFIG=dists/redhat/Makefile.config \
        DOCDIR=$RPM_BUILD_ROOT%{_docdir}/munin \
        MANDIR=$RPM_BUILD_ROOT%{_mandir} \
-       DESTDIR=$RPM_BUILD_ROOT \
-       install
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/munin-node
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/munin
@@ -127,6 +137,7 @@ fi
 %doc README.api README.plugins ChangeLog
 # %{_docdir}/munin/README.config
 %attr(755,root,root) %{_sbindir}/munin-cron
+%dir %{_datadir}/munin
 %{_datadir}/munin/munin-graph
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
@@ -144,14 +155,16 @@ fi
 %dir %{_sysconfdir}/munin/templates
 %{_sysconfdir}/munin/templates/*
 /etc/cron.d/munin
-%config(noreplace) %{_sysconfdir}/munin/munin.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/munin/munin.conf
 
-%attr(-, munin, root) %dir /var/lib/munin
-%attr(-, munin, root) %dir /var/log/munin
-%attr(-, munin, root) %dir /var/www/html/munin
-%attr(-, munin, root) %dir /var/www/html/munin/cgi/cgi
-%attr(-, munin, root) /var/www/html/munin/style.css
-%attr(-, munin, root) %config /var/www/html/munin/.htaccess
+# XXX: don't use %attr(-,...)
+%attr(-,munin,root) %dir /var/lib/munin
+%attr(-,munin,root) %dir /var/log/munin
+# XXX: FHS
+%attr(-,munin,root) %dir /var/www/html/munin
+%attr(-,munin,root) %dir /var/www/html/munin/cgi/cgi
+%attr(-,munin,root) /var/www/html/munin/style.css
+%attr(-,munin,root) %config /var/www/html/munin/.htaccess
 
 %{_mandir}/man8/munin-graph*
 %{_mandir}/man8/munin-update*
@@ -173,12 +186,14 @@ fi
 %attr(755,root,root) %{_sbindir}/munin-node
 %attr(755,root,root) %{_sbindir}/munin-node-configure
 %attr(755,root,root) %{_sbindir}/munin-node-configure-snmp
-%attr(-, munin, root) %dir /var/log/munin
+# XXX: don't use %attr(-,...)
+%attr(-,munin,root) %dir /var/log/munin
 %dir %{_datadir}/munin
 
-%dir %attr(770, munin, munin) /var/lib/munin
-%dir %attr(770, munin, munin) /var/lib/munin/plugin-state
+%dir %attr(770,munin,munin) /var/lib/munin
+%dir %attr(770,munin,munin) /var/lib/munin/plugin-state
 
+%dir %{_datadir}/munin/plugins
 %{_datadir}/munin/plugins/*
 
 %{_mandir}/man5/munin-node*