Browse Source

munin:
- update to munin-2.0.8
- add async/cgi sub package
- add lots of BR..
- cleanup specfiles to remove fedora/rhel stuff..

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7205 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 11 years ago
parent
commit
5a6c992153
1 changed files with 252 additions and 129 deletions
  1. 252 129
      m/munin/munin-vl.spec

+ 252 - 129
m/munin/munin-vl.spec

@@ -1,5 +1,5 @@
 Name:      munin
-Version:   1.4.6
+Version:   2.0.8
 Release:   1%{?_dist_release}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
@@ -11,39 +11,41 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz
 Source10: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.tar.gz.sha256sum
 
-Patch1: munin-1.4.6-restorecon.patch
-Patch2: munin-1.4.2-fontfix.patch
-
-Source1: munin-1.2.4-sendmail-config
-Source2: munin-1.2.5-hddtemp_smartctl-config
-Source3: munin-node.logrotate
-Source4: munin.logrotate
-Source6: munin-1.2.6-postfix-config
-Source7: munin-1.4.5-df-config
-Source8: munin-node.service
-Source9: %{name}.conf
+Source1:  munin-1.2.4-sendmail-config
+Source2:  munin-1.2.5-hddtemp_smartctl-config
+Source3:  munin-node.logrotate
+Source4:  munin.logrotate
+Source6:  munin-1.2.6-postfix-config
+Source7:  munin-1.4.5-df-config
+Source9:  munin.conf
+Source12: cpuspeed.in.rev1243
+Source13: linux-init.d_munin-asyncd.in
+Source17: munin.cron.d
+Source18: munin-node.rc
+Source19: httpd_munin-cgi.conf
+
+Patch4:         munin-2.0.4-Utils-cluck.patch
+Patch5:         acpi-2.0.5.patch
+Patch7:         munin-2.0-defect-1213.patch
+Patch9:         munin-2.0.8-cgitmp.patch
 
 BuildArchitectures: noarch
 
-BuildRequires: perl-Module-Build
-# needed for hostname for the defaut config
-BuildRequires: net-tools
-BuildRequires: perl-HTML-Template
-BuildRequires: perl-Log-Log4perl
-BuildRequires: perl-Net-Server
-BuildRequires: perl-Net_SSLeay
-BuildRequires: perl-Net-SNMP
-
-# java buildrequires on fedora
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
-BuildRequires: java-1.7.0-devel
-BuildRequires: mx4j
-BuildRequires: jpackage-utils
-%endif
-
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-BuildRequires: systemd-units
-%endif
+BuildRequires:  net-tools
+BuildRequires:  perl >= 5.8
+BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Net::Server)
+BuildRequires:  perl(Net::SSLeay)
+BuildRequires:  perl(Net::SNMP)
+BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::MockModule)
+BuildRequires:  perl(Test::MockObject)
+#BuildRequires:  perl(Test::Perl::Critic) >= 1.096 ## Not packaged
+BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Time::HiRes)
+BuildRequires:  perl(Net::SSLeay)
+BuildRequires:  perl(HTML::Template)
+BuildRequires:  perl(Log::Log4perl) >= 1.18
 
 Requires: %{name}-common = %{version}
 Requires: perl-Net-Server
@@ -53,11 +55,7 @@ Requires: logrotate
 Requires: /bin/mail
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%if 0%{?rhel} > 5 || 0%{?fedora} > 6
-Requires: dejavu-sans-mono-fonts
-%else
-Requires: bitstream-vera-fonts
-%endif
+Requires: TrueType-bitstream-vera
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -108,6 +106,22 @@ SNMP or similar technology.
 Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
 RRDtool.
 
+
+%package async
+Group:          System Environment/Daemons
+Summary:        Network-wide graphing framework (asynchronous client tools)
+BuildArch:      noarch
+Requires:       %{name}-node = %{version}
+
+%description async
+Munin is a highly flexible and powerful solution used to create graphs
+of virtually everything imaginable throughout your network, while still
+maintaining a rattling ease of installation and configuration.
+
+This package contains the tools necessary for setting up an asynchronous
+client / spooling system
+
+
 %package common
 Group: System Environment/Daemons
 Summary: Network-wide graphing framework (common files)
@@ -122,107 +136,187 @@ maintaining a rattling ease of installation and configuration.
 This package contains common files that are used by both the server (munin)
 and node (munin-node) packages.
 
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
-%package java-plugins
-Group: System Environment/Daemons
-Summary: java-plugins for munin
-Requires: %{name}-node = %{version}
-BuildArchitectures: noarch
-
-%description java-plugins
-java-plugins for munin-node.
-%endif
+%package cgi
+Group:          System Environment/Daemons
+Summary:        Network-wide graphing framework (common files)
+BuildArch:      noarch
+Requires:       %{name}-common = %{version}
+Requires:       mod_fcgid
+Requires:       spawn-fcgi
+
+%description cgi
+Munin package uses cron by default.  This package contains the CGI
+files that can generate HTML and graphs dynamically. This enables 
+munin to scale better for a master with many nodes.
+
+See documentation for setup instructions:
+http://munin-monitoring.org/wiki/CgiHowto2
+
+QUICK-HOWTO:
+sed -i 's/\(.*\)_strategy.*/\1_strategy cgi/' /etc/munin/munin.conf
+cp --backup /etc/sysconfig/spawn-fcgi-munin /etc/sysconfig/spawn-fcgi
+for svc in apache2 munin-node spawn-fcgi; do
+  chkconfig $svc on
+  service $svc start
+done
+    
 
 %prep
 %setup -q
-%patch1 -p1
 
-%if 0%{?rhel} < 6 && 0%{?fedora} < 11
-%patch2 -p0
-%endif
+sed -i -e '
+  s,^CGIDIR     = \(.*\),CGIDIR     = $(DESTDIR)/var/www/cgi-bin,;
+  s,^CGITMPDIR  = \(.*\),CGITMPDIR  = /var/tmp,;
+  s,^CHGRP      := \(.*\),CHGRP      := echo Not done: chgrp,;
+  s,^CHMOD      := \(.*\),CHMOD      := echo Not done: chmod,;
+  s,^CHOWN      := \(.*\),CHOWN      := echo Not done: chown,;
+  s,^CONFDIR    = \(.*\),CONFDIR    = $(DESTDIR)/etc/munin,;
+  s,^DBDIR      = \(.*\),DBDIR      = $(DESTDIR)/var/lib/munin,;
+  s,^DBDIRNODE  = \(.*\),DBDIRNODE  = $(DESTDIR)/var/opt/munin-node,;
+  s,^DOCDIR     = \(.*\),DOCDIR     = $(DESTDIR)%{_datadir}/doc/munin-$(VERSION),;
+  s,^GROUP      := \(.*\),GROUP      := nobody,;
+  s,^HOSTNAME   = \(.*\),HOSTNAME    = localhost.localdomain,;
+  s,^HTMLDIR    = \(.*\),HTMLDIR    = $(DESTDIR)/var/www/html/munin,;
+  s,^LIBDIR     = \(.*\),LIBDIR     = $(DESTDIR)%{_datadir}/munin,;
+  s,^LOGDIR     = \(.*\),LOGDIR     = $(DESTDIR)/var/log/munin,;
+  s,^PERL       := \(.*\),PERL       := /usr/bin/perl,;
+  s,^PERLSITELIB := \(.*\),PERLSITELIB := %{perl_vendorlib},;
+  s,^PLUGSTATE  = \(.*\),PLUGSTATE  = $(DBDIR)/plugin-state,;
+  s,^PREFIX     = \(.*\),PREFIX     = $(DESTDIR)/usr,;
+  s,^PYTHON     := \(.*\),PYTHON     := /usr/bin/python,;
+  s,^RUBY       := \(.*\),RUBY       := /usr/bin/ruby,;
+  s,^USER       := \(.*\),USER       := nobody,;
+  ' Makefile.config
+
+install -c %{SOURCE12} ./plugins/node.d.linux/cpuspeed.in
+
+%patch4 -p0
+%patch5 -p0
+%patch7 -p1
+%patch9 -p1
+
+install -c %{SOURCE13} ./resources/
 
 %build
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
-export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
-%endif
-make    CONFIG=dists/redhat/Makefile.config
+make    CONFIG=Makefile.config
+
+# Convert to utf-8
+for file in Announce-2.0 COPYING ChangeLog Checklist HACKING.pod README RELEASE UPGRADING UPGRADING-1.4; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+
+# Fix the wrong FSF address
+for FILE in plugins/node.d.linux/tcp.in COPYING plugins/node.d.linux/bonding_err_.in; do
+  sed -i 's|59 Temple Place.*Suite 330, Boston, MA *02111-1307|51 Franklin St, Fifth Floor, Boston, MA 02110-1301|g' $FILE
+done
 
 %install
 
 ## Node
-make    CONFIG=dists/redhat/Makefile.config \
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
-        JAVALIBDIR=%{buildroot}%{_datadir}/java \
-%endif
+make    CONFIG=Makefile.config \
         PREFIX=%{buildroot}%{_prefix} \
         DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
         MANDIR=%{buildroot}%{_mandir} \
         DESTDIR=%{buildroot} \
         install
 
-mkdir -p %{buildroot}/etc/munin/plugins
-mkdir -p %{buildroot}/etc/munin/node.d
-mkdir -p %{buildroot}/etc/munin/plugin-conf.d
-mkdir -p %{buildroot}/etc/munin/conf.d
+# Remove fonts
+rm %{buildroot}%{_datadir}/munin/DejaVuSans*.ttf
+
+# install logrotate scripts
 mkdir -p %{buildroot}/etc/logrotate.d
-mkdir -p %{buildroot}/var/lib/munin
-mkdir -p %{buildroot}/var/log/munin
+install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
+install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 
-# Fix default config file
-sed -i 's,/etc/munin/munin-conf.d,/etc/munin/conf.d,' %{buildroot}/etc/munin/munin.conf
+# BZ#821912 - Move .htaccess to apache config to allow easier user-access changes.
+mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d
+sed -e 's/# </</g' %{buildroot}/var/www/html/munin/.htaccess > %{buildroot}%{_sysconfdir}/apache2/conf.d/munin.conf
+rm %{buildroot}/var/www/html/munin/.htaccess
+
+# install cron script
+mkdir -p %{buildroot}/etc/cron.d
+install -m 0644 %{SOURCE17} %{buildroot}/etc/cron.d/munin
 
 #
 # don't enable munin-node by default.
 #
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-mkdir -p %{buildroot}/lib/systemd/system/
-install -m 0644 %{SOURCE8} %{buildroot}/lib/systemd/system/munin-node.service
-%else
 mkdir -p %{buildroot}/etc/rc.d/init.d
-cat dists/redhat/munin-node.rc | sed -e 's/2345/\-/' > %{buildroot}/etc/rc.d/init.d/munin-node
+cat %{SOURCE18} | sed -e 's/2345/\-/' > %{buildroot}/etc/rc.d/init.d/munin-node
 chmod 755 %{buildroot}/etc/rc.d/init.d/munin-node
-%endif
+install -m 0755 %{SOURCE13} %{buildroot}/etc/rc.d/init.d/munin-asyncd
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
 install -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
 
-install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
-
-#
-# remove the Sybase plugin for now, as they need perl modules
-# that are not in extras. We can readd them when/if those modules are added.
-#
-rm -f %{buildroot}/usr/share/munin/plugins/sybase_space
-
-## Server
-
-mkdir -p %{buildroot}/var/www/html/munin
-mkdir -p %{buildroot}/var/log/munin
-mkdir -p %{buildroot}/etc/cron.d
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
-
-install -m 0644 dists/redhat/munin.cron.d %{buildroot}/etc/cron.d/munin
-cp -a master/www/* %{buildroot}/var/www/html/munin/
+# Fix default config file
+sed -i '
+  s,/etc/munin/munin-conf.d,/etc/munin/conf.d,;
+  s,#html_strategy.*,html_strategy cron,;
+  s,#graph_strategy.*,graph_strategy cron,;
+  ' %{buildroot}/etc/munin/munin.conf
+mkdir -p %{buildroot}/etc/munin/conf.d
+mkdir -p %{buildroot}/etc/munin/plugin-conf.d
+mkdir -p %{buildroot}/etc/munin/node.d
+mkdir -p %{buildroot}/etc/munin/plugin-node.d
 
 # install config for sendmail under fedora
 install -m 0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/sendmail
+
 # install config for hddtemp_smartctl
 install -m 0644 %{SOURCE2} %{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl
+
 # install logrotate scripts
 install -m 0644 %{SOURCE3} %{buildroot}/etc/logrotate.d/munin-node
 install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
-# install config for postfix under fedora
+sed -i 's/su munin/#su munin/' %{buildroot}/etc/logrotate.d/munin-node
+sed -i 's/su munin/#su munin/' %{buildroot}/etc/logrotate.d/munin
+
+# install config for postfix
 install -m 0644 %{SOURCE6} %{buildroot}/etc/munin/plugin-conf.d/postfix
+
 # install df config to exclude fses we shouldn't try and monitor
 install -m 0644 %{SOURCE7} %{buildroot}/etc/munin/plugin-conf.d/df
-# Create for BZ 786030
-touch %{buildroot}/var/lib/munin/plugin-state/yum.state
 
-# Use system font
-rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSansMono.ttf
-rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/DejaVuSans.ttf
+# Append for BZ# 746083
+cat - >> %{buildroot}/etc/munin/plugin-conf.d/munin-node <<EOT.node
+[diskstats]
+user munin
+
+[iostat_ios]
+user munin
+EOT.node
+
+# Preload static html files
+mkdir -p %{buildroot}/var/www/html/munin/
+cp -r %{buildroot}/etc/munin/static %{buildroot}/var/www/html/munin/
+
+# Remove plugins that are missing deps
+rm %{buildroot}/usr/share/munin/plugins/sybase_space
+
+# Create DBDIRNODE
+mkdir -p %{buildroot}/var/lib/munin-node/plugin-state
+
+# Fix config file so that it no longer references the build host
+sed -i 's/^\[.*/\[localhost\]/' %{buildroot}/etc/munin/munin.conf
+
+# Create sample fcgi config files
+mkdir -p %{buildroot}/etc/sysconfig %{buildroot}/etc/apache2/conf.d
+cp %{SOURCE19} %{buildroot}/etc/apache2/conf.d/munin-cgi.conf
+cat > %{buildroot}/etc/sysconfig/spawn-fcgi-munin <<EOT
+# SAMPLE: Rename this file to /etc/sysconfig/spawn-fcgi and edit to fit
+# (Without something like this, munin-cgi will not work properly via init script)
+SOCKET=/var/run/munin/fcgi-graph.sock
+OPTIONS="-U www-data -u www-data -g www-data -s $SOCKET -S -M 0600 -C 32 -F 1 -P /var/run/spawn-fcgi.pid -- /var/www/cgi-bin/munin-cgi-graph"
+
+EOT
+
+# create symlinks to munin-asyncd in %%{_sbindir}
+for i in munin-async munin-asyncd
+do
+  ln -sf %{_datadir}/munin/$i %{buildroot}%{_sbindir}/$i
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -245,15 +339,34 @@ if [ "$1" = "1" ]; then
 fi
 
 %preun node
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-test "$1" != 0 || %{_bindir}/systemctl disable munin-node.service || :
-%else
-test "$1" != 0 || %{_initrddir}/munin-node stop &>/dev/null || :
-test "$1" != 0 || /sbin/chkconfig --del munin-node
-%endif
+if [ "$1" = 0 ]; then
+  for svc in node asyncd fcgi-html fcgi-graph; do
+    service munin-${svc} stop &>/dev/null || :
+    /sbin/chkconfig --del munin-${svc}
+  done
+fi
 
 %postun node
-find /etc/munin/plugins/ -maxdepth 1 -type l -print0 |xargs -0 rm
+if [ "$1" = "0" ]; then
+  [ -d %{_sysconfdir}/munin/plugins ] && \
+    find %{_sysconfdir}/munin/plugins/ -maxdepth 1 -type l -print0 | \
+      xargs -0 rm || :
+fi
+
+%triggerun node -- munin-node < 1.4.7
+cp -a %{_sysconfdir}/munin/plugins %{_sysconfdir}/munin/plugins.bak || :
+
+%triggerpostun node -- munin-node < 1.4.7
+mv -f %{_sysconfdir}/munin/plugins.bak/* %{_sysconfdir}/munin/plugins/ || :
+
+
+%preun cgi
+if [ "$1" = 0 ]; then
+  for svc in fcgi-html fcgi-graph; do
+    service munin-${svc} stop &>/dev/null || :
+    /sbin/chkconfig --del munin-${svc}
+  done
+fi
 
 #
 # main package scripts
@@ -267,30 +380,37 @@ exit 0
 
 %files
 %defattr(-, root, root)
-%doc %{_docdir}/%{name}-%{version}/
 %{_bindir}/munin-cron
 %{_bindir}/munindoc
 %{_bindir}/munin-check
+%{_sbindir}/munin-sched
 %dir %{_datadir}/munin
 %{_datadir}/munin/munin-graph
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
+%{_datadir}/munin/munin-datafile2storable
+%{_datadir}/munin/munin-storable2datafile
 %{perl_vendorlib}/Munin/Master
 %dir /etc/munin/templates
 %dir /etc/munin
 %dir /etc/munin/conf.d
 %config(noreplace) /etc/munin/templates/*
+%config(noreplace) /etc/munin/static/*
 %config(noreplace) /etc/cron.d/munin
 %config(noreplace) /etc/munin/munin.conf
 %config(noreplace) /etc/logrotate.d/munin
+%config(noreplace) /etc/apache2/conf.d/munin.conf
 %attr(-, munin, munin) %dir /var/lib/munin
 %attr(-, munin, munin) %dir /var/lib/munin/plugin-state
 %attr(-, munin, munin) %dir /var/run/munin
 %attr(-, munin, munin) %dir /var/log/munin
 %attr(-, munin, munin) /var/www/html/munin
-%doc %{_mandir}/man8/munin*
+%doc %{_mandir}/man1/munindoc*
+%doc %{_mandir}/man1/munin-sched*
+%doc %{_mandir}/man3/Munin::Master*
 %doc %{_mandir}/man5/munin.conf*
+%doc %{_mandir}/man8/munin*
 
 %files node
 %defattr(-, root, root)
@@ -303,11 +423,7 @@ exit 0
 %config(noreplace) /etc/munin/plugin-conf.d/postfix
 %config(noreplace) /etc/munin/plugin-conf.d/df
 %config(noreplace) /etc/logrotate.d/munin-node
-%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-/lib/systemd/system/munin-node.service
-%else
 /etc/rc.d/init.d/munin-node
-%endif
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
@@ -317,38 +433,45 @@ exit 0
 %dir /etc/munin
 %attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
-%attr(-, munin, munin) /var/lib/munin/plugin-state/yum.state
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
-%exclude %{_datadir}/munin/plugins/jmx_
-%endif
 %{_datadir}/munin/plugins/
-%doc %{_docdir}/%{name}-%{version}/
 %doc %{_mandir}/man5/munin-node*
-%doc %{_mandir}/man3/Munin*
-%doc %{_mandir}/man1/munin*
+%doc %{_mandir}/man3/Munin::Common*
+%doc %{_mandir}/man3/Munin::Node*
+%doc %{_mandir}/man3/Munin::Plugin*
+%doc %{_mandir}/man1/munin-node*
+%doc %{_mandir}/man1/munin-run*
 %{perl_vendorlib}/Munin/Node
 %{perl_vendorlib}/Munin/Plugin*
 
+
+%files async
+%defattr(-,root,root)
+%{_sbindir}/munin-async*
+%{_datadir}/munin/munin-async*
+%{_sysconfdir}/rc.d/init.d/munin-asyncd
+
+
 %files common
 %defattr(-, root, root)
-%doc Announce-1.4.0 ChangeLog COPYING HACKING.pod perltidyrc README RELEASE UPGRADING
+%doc Announce-2.0 ChangeLog COPYING HACKING.pod perltidyrc README RELEASE UPGRADING
 %dir %{perl_vendorlib}/Munin
 %{perl_vendorlib}/Munin/Common
-
-%if 0%{?rhel} > 6 || 0%{?fedora} > 14
-%dir %{_localstatedir}/run/%{name}/
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
 
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
-%files java-plugins
-%defattr(-, root, root)
-%{_datadir}/java/%{name}-jmx-plugins.jar
-%{_datadir}/munin/plugins/jmx_
-%endif
+
+%files cgi
+%defattr(-,root,root)
+%attr(0755,root,munin) /var/www/cgi-bin/munin-cgi-graph
+%attr(0755,root,munin) /var/www/cgi-bin/munin-cgi-html
+%config(noreplace) %{_sysconfdir}/sysconfig/spawn-fcgi-munin
+%config(noreplace) %{_sysconfdir}/apache2/conf.d/munin-cgi.conf
 
 
 %changelog
+* Tue Dec 04 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.8-1
+- update to munin-2.0.8
+- add async/cgi sub package
+
 * Thu Mar 22 2012 Yasumichi Akahoshi <yasumichi@vinelinux.org> 1.4.6-1
 - Initial build for Vine Linux.
 
@@ -573,7 +696,7 @@ exit 0
 - Sync with release of 1.2.2
 - Add some nice text from the suse specfile
 - Minimal changes in the header
-- Some cosmetic changes
+- Som ecosmetic changes
 - Added logrotate scripts (stolen from debian package)
 
 * Sun Feb 01 2004 Ingvar Hagelund <ingvar@linpro.no>