/[smeserver]/rpms/smeserver-yum/sme10/smeserver-yum.spec

Diff of /rpms/smeserver-yum/sme10/smeserver-yum.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.2 by vip-ire,
Sun Feb  7 12:10:35 2016 UTC
+Revision 1.87 by michel,
Mon Feb 27 08:57:26 2023 UTC
 Line 1
- # $Id: smeserver-yum.spec,v 1.1 2016/02/05 23:20:26 stephdl Exp $
+ # $Id: smeserver-yum.spec,v 1.86 2022/11/22 19:39:09 jpp Exp $
  %define name smeserver-yum
  Summary: YUM, an rpm updater
  Name: %{name}
- %define version 2.6.0
+ %define version 2.6.2
- %define release 2
+ %define release 3
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
  Group: SMEServer/addon
  Source: %{name}-%{version}.tar.xz
+ Patch0: smeserver-yum-2.6.2-bz12179-smecontribs-enabled.patch
+ Patch1: smeserver-yum-2.6.2-bz12171_bz12209_no_reconfigure.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArchitectures: noarch
  Requires: e-smith-formmagick >= 1.4.0-12
-Line 22 
 Obsoletes: check4updates
+Line 25 
 Obsoletes: check4updates
  Provides: check4updates
  Obsoletes: rpmdb-CentOS
  Requires: yum-plugin-fastestmirror
+ Requires: yum-plugin-priorities
  Obsoletes: yum-plugin-installonlyn
  Obsoletes: yum-protect-packages <= 1.1.16
+ Requires: yum-plugin-post-transaction-actions
  Requires: mailx
+ Requires: deltarpm
+ Requires: yum-cron
  BuildRequires: e-smith-devtools >= 1.13.1-03
  BuildRequires: python
  Conflicts: centos-yumconf
-Line 32 
 AutoReqProv: no
+Line 39 
 AutoReqProv: no
  %description
  %name is an implementation of http://linux.duke.edu/projects/yum on SME Server
+ %prep
+ %setup
+ rm -rf root/var/service/ root/service/
+ rm -rf root/etc/e-smith/db/configuration/force
+ %patch0 -p1
+ %patch1 -p1
+ %build
+ perl createlinks
+ mkdir -p root/etc/yum.smerepos.d
+ %install
+ /bin/rm -rf $RPM_BUILD_ROOT
+ (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
+ /bin/rm -f %{name}-%{version}-filelist
+ /sbin/e-smith/genfilelist \
+     --file '/sbin/e-smith/yum_update_dbs' 'attr(0700,root,root)' \
+     --file '/sbin/e-smith/yum' 'attr(0755,root,root)' \
+     --file '/sbin/e-smith/check4updates' 'attr(0755,root,root)' \
+     --file '/sbin/e-smith/check4contribsupdates' 'attr(0755,root,root)' \
+     --file '/sbin/e-smith/yumdownloadonly' 'attr(0755,root,root)' \
+     --file '/etc/cron.daily/smeserver-yum' 'attr(0700,root,root)' \
+     --dir /var/log/yum 'attr(2750,root,root)' \
+     $RPM_BUILD_ROOT > %{name}-%{version}-%{release}-filelist
+ %clean
+ /bin/rm -rf $RPM_BUILD_ROOT
+ %files -f %{name}-%{version}-%{release}-filelist
+ %defattr(-,root,root)
+ %pre
+ if [ $1 -gt 1 ] ; then
+   if [ -e /var/service/yum/run ] ; then
+        /usr/bin/sv d yum
+        /usr/bin/sv d yum/log
+   fi
+ fi
  %changelog
+ * Mon Feb 27 2023 Michel Begue <mab974@misouk.com> 2.6.2-3.sme
+ - fix reconfigure asked when not needed [SME: 12171]
+ - do not show reconfigure button and message if not needed [SME: 12209]
+ * Tue Nov 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.2-2.sme
+ - set smecontribs enabled on new install [SME: 12179]
+ * Mon Jul 11 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.2-1.sme
+ - bump version number
+ - no reboot for dbus-glib [SME: 12091]
+ * Tue Jun 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-64.sme
+ - rephrase contrib update message [SME: 11543]
+ - move mysqld to mariadb in smeserver plugin [SME: 11921]
+ * Sun Apr 24 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-63.sme
+ - remove force AutoInstallUpdates to disabled [SME: 11961]
+ * Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-61.sme
+ - fix rotate yum.log as not standard location [SME: 11951]
+ - remove yum_update_dbs from messages log [SME: 11952]
+ * Tue Mar 08 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-60.sme
+ - restart cvm-unix on cvm or bglibs update [SME: 11886]
+ * Mon Dec 20 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-59.sme
+ - remove pop3 and pop3s services from plugin [SME: 11808]
+ * Thu Dec 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-58.sme
+ - fix restarting spamd instead of spamassassin [SME: 11803]
+ * Fri Dec 03 2021 Brian Read <brianr@bjsystems.co.uk> 2.6.0-57.sme
+ - Re-word-reboot-required-message.patch [SME: 11790]
+ * Sun Nov 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-56.sme
+ - fix wrong qpsmtpd handling [SME: 11768]
+ * Mon Jun 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-55.sme
+ - add elrepo GPG key [SME: 11625]
+ * Mon May 31 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-54.sme
+ - no reboot needed for systemd-python [SME: 11609]
+ * Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-53.sme
+ - fix services stop on removal [SME: 11510]
+ * Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-52.sme
+ - run navigation-conf when a panel is installed [SME: 11507]
+ * Sun Mar 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-51.sme
+ - migrate back to normal CentOS mirrors after el6 EOL  [SME: 11477]
+ - version 2 with
+   deleting yum{eolversion} if for previous release or not yet eol
+   better handling of conditions
+ * Wed Mar 17 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-49.sme
+ - avoid reboot on removal of smeserver-* rpms [SME: 11458]
+ - navigation-conf when a panel is installed
+ * Wed Feb 24 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-47.sme
+ - fix wrong path for rsyslog.conf [SME: 11364]
+ * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-46.sme
+ - remove noise in yum process "overriding all signals, forcing restart" [SME: 11372]
+ * Fri Feb 19 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-45.sme
+ - packages installed logged both in yum.log and message [SME: 11364]
+ - set priority to 10 for remi-safe [SME: 11360]
+ * Mon Feb 15 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-44.sme
+ - fix poor handling of service adjusting and action order [SME: 11300]
+   now a temp event is created
+   also better logging, better handling of update vs removal
+ * Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-43.sme
+ - make yum dbs service fork [SME: 11243]
+   now smeserver.py plugin call the service
+   yum-modify can use the service restart
+   yum.service is its own service, not called by local.service
+ * Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-42.sme
+ - move yum upate db service to systemd [SME: 11180]
+ * Sun Dec 06 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-41.sme
+ - fix -update events not runt on package upgrade [SME: 11184]
+   lower noise on forced restart
+ * Thu Dec 03 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-39.sme
+ - fix switch to vault BaseURL for CentOS [SME: 11227]
+ * Mon Nov 16 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-38.sme
+ - add remi-safe as base repo [SME: 11179]
+ - smeserver-yum-update event created [SME: 11168]
+ * Sun Nov 15 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-37.sme
+ - fix separate action before template, and after service [SME: 11175]
+   run all actions with post-upgrade as default event
+ * Tue Nov 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-36.sme
+ - fix some templates not expanded [SME: 11121]
+ * Tue Oct 20 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-35.sme
+ - fix smeserver.py not executing action because of wrong path [SME: 11047]
+ * Mon Jun 22 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-33.sme
+ - fix error when key absent of a dict of smeserver plugin at clean stage [SME: 10931]
+ * Thu Jan 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-32.sme
+ - avoid missing template error after removal of a rpm [SME: 10846]
+ * Thu Jan 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-30.sme
+ - restart php-fpm services when needed [SME: 10873]
+ * Mon Dec 09 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-29.sme
+ - applying patch [SME: 10690]
+ * Sun Dec 08 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-27.sme
+ - fix NameError: global name 'yum_update_dbs' is not defined [SME: 6940]
+ * Fri Dec 06 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-26.sme
+ - use yum-cron with autoupdate feature [SME: 10690]
+   * use yum-cron for download only or auto update
+   * yum-cron.conf templates
+   * update lock path
+   * settings in server-manager
+   * remove yumdownloadonly script and crontab template
+ * Fri Dec 06 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-25.sme
+ - fix typo on patch [SME: 10249]
+ * Wed Dec 04 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-24.sme
+ - fix header detected as package [SME: 10843]
+ - avoid discrepancy between manager, cli and email [SME: 6940]
+   * force refresh of metadata before db generation
+   * add regeneration of db during check4updates, after yum update/install/remove
+ - fix no installed groups file [SME: 118]
+ - switch to centos vault after EOL [SME: 10249]
+ - update http://mirrorlist.contribs.org/mirrorlist to https://mirrorlist.koozali.org/mirrorlist [SME: 9697]
+ - make smecontribs visible [SME: 10716]
+ * Mon Feb 18 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-22.sme
+ - add openfusion gpg key [SME: 10742]
+ * Sat Jan 26 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-21.sme
+ - updated EOL patch [SME: 10170]
+ * Wed Jan 23 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-19.sme
+ - add yum-priority as requirement [SME: 6499]
+   add support for plugin priority using property priority im yum_repositories db
+   initial priority to 10 for sme*, base and updates repos.
+   property yum priority set as enabled as default
+ - avoid double check updates for contribs if smecontribs is set to enabled [SME: 9388]
+ - update check4contribs email format to match check4updates [SME: 8782]
+ - improve yum plugin to avoid reboot [SME: 8705]
+   add nut support, add exclusions for -doc, -devel... subpackages
+ * Tue Jan 22 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+ - add message to indicate EOL after Jun 30 2024 fix [SME: 10170]
+ * Mon Nov 06 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
+ - add yum-plugin-post-transaction-actions as requirement [SME: 1100]
+ * Tue May 02 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
+ - add rpmfusion free el7 RPM GPG KEY [SME: 10263]
+ * Mon Apr 10 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+ - avoid reboot for smeserver-locale upgrade [SME: 8705]
+ - code by stefano zamboni <zamboni@mind-at-work.it>
+ * Wed Mar 29 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme
+ - correct service names with plugin to avoid reboot [SME: 8705]
+ - code by stefano zamboni <zamboni@mind-at-work.it>
+ * Mon Mar 27 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
+ - fix KeyError with plugin to avoid reboot [SME: 8705]
+ - code by stefano zamboni <zamboni@mind-at-work.it>
+ * Mon Mar 20 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+ - remove centos contrib repo [SME: 10156]
+ * Sat Feb 25 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+ - added centos SCLo SIG gpg rpm signing key [SME: 10119]
+ - will allow to install SCL packages directly from smecontribs
+ * Sat Feb 18 2017 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-10.sme
+ - Added smeserver-yum-2.6.0.bz8705.avoidReboot.patch [SME: 8705]
+ - code by stefano zamboni <zamboni@mind-at-work.it>
+ - Avoid to reboot after the installation of a smeserver-* package
+ * Fri Jan 06 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+ - add Remi Collet RPM GPG KEY [SME: 9903]
+ * Thu Aug 04 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-7.sme
+ - Rpm updates can be downloaded during the night [SME: 1502]
+ - Added smeserver-yum-2.6.0.bz1502.DownloadOnly.patch
+ * Mon Aug 1 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-6.sme
+ - Deltarpm is now a setting in the yum panel (disabled by default)
+ - Added smeserver-yum-2.6.0.bz8834.DeltaRpm.patch [SME: 8834]
+ * Fri May 27 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
+ - adding Koozali SME10, EPEL7 and Centos7 gpg keys [SME: 9533]
+ * Thu May 12 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-4.sme
+ - Rebuild [SME: 9393]
+ * Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+ - yum points now to SME10 mirrors [SME: 9377]
+ - moved changelog at the end of file
+ - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+   by assuming the date is correct and changing the weekday.
+   Fri May 31 2005 --> Fri May 27 2005 or Tue May 31 2005 or Fri Jun 03 2005 or ....
+   Fri Nov 16 2006 --> Fri Nov 10 2006 or Thu Nov 16 2006 or Fri Nov 17 2006 or ....
+   Fri Nov 23 2006 --> Fri Nov 17 2006 or Thu Nov 23 2006 or Fri Nov 24 2006 or ....
  * Sun Feb 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-2.sme
  - Add python to BuildReq so brp-python-bytecode compiles sme yum plugin
    [SME: 9229]
-Line 270 
 AutoReqProv: no
+Line 534 
 AutoReqProv: no
  * Wed Nov 29 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-20
  - Revert to 10s panel refresh [SME: 2097]
- * Fri Nov 23 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-19
+ * Thu Nov 23 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-19
+   Fri Nov 23 2006 --> Fri Nov 17 2006 or Thu Nov 23 2006 or Fri Nov 24 2006 or ....
  - Make CentOS base and updates enabled/Visible by default [SME: 1849]
  - Migrate CentOS base and updates to Visible, but leave status [SME: 1849]
- * Fri Nov 23 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-18
+ * Thu Nov 23 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-18
+   Fri Nov 23 2006 --> Fri Nov 17 2006 or Thu Nov 23 2006 or Fri Nov 24 2006 or ....
  - Adjust wording on post-upgrade page [SME: 2076]
  * Tue Nov 21 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-17
-Line 286 
 AutoReqProv: no
+Line 552 
 AutoReqProv: no
    page is displayed from other sessions
  - TODO: Re-add display of LogFile prior to reconfigure
- * Fri Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-15
+ * Thu Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-15
+   Fri Nov 16 2006 --> Fri Nov 10 2006 or Thu Nov 16 2006 or Fri Nov 17 2006 or ....
  - Add dependency on yum-plugin-fastestmirror [SME: 1163]
  - Alpha sort dependencies
- * Fri Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-14
+ * Thu Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-14
+   Fri Nov 16 2006 --> Fri Nov 10 2006 or Thu Nov 16 2006 or Fri Nov 17 2006 or ....
  - Add MirrorList options to each of the SME repos [SME: 1163]
- * Fri Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-13
+ * Thu Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-13
+   Fri Nov 16 2006 --> Fri Nov 10 2006 or Thu Nov 16 2006 or Fri Nov 17 2006 or ....
  - Put back missed patch for post-upgrade [SME: 2071]
- * Fri Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-12
+ * Thu Nov 16 2006 Gordon Rowell <gordonr@gormand.com.au> 1.2.0-12
+   Fri Nov 16 2006 --> Fri Nov 10 2006 or Thu Nov 16 2006 or Fri Nov 17 2006 or ....
  - Re-add post-upgrade handling [SME: 2071]
  - Display yum output
  - Lower refresh to 3 seconds from 10
-Line 337 
 AutoReqProv: no
+Line 607 
 AutoReqProv: no
  * Wed Mar 15 2006 Charlie Brady <charlie_brady@mitel.com> 1.2.0-01
  - Roll stable stream version. [SME: 1016]
- * Wed Mar 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-26
+ * Mon Mar 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-26
  - And migrate old SME repo URLs to new paths [SME: 951]
- * Wed Mar 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-25
+ * Mon Mar 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-25
  - Change SME Server repo URLs to match repo names so we avoid confusion
    with CentOS repos and can remove the symlinks [SME: 951]
- * Wed Mar 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-24
+ * Mon Mar 6 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-24
  - Don't force the BaseURL properties - just set defaults [SME: 951]
  * Wed Feb 22 2006 Gordon Rowell <gordonr@gormand.com.au> 1.1.2-23
-Line 648 
 AutoReqProv: no
+Line 918 
 AutoReqProv: no
    are modified for the SMEServer releases
  - INSTALL: Need to manually remove old version of yum_repositories DB
- * Fri May 31 2005 Gordon Rowell <gordonr@gormand.com.au>
+ * Tue May 31 2005 Gordon Rowell <gordonr@gormand.com.au>
+   Fri May 31 2005 --> Fri May 27 2005 or Tue May 31 2005 or Fri Jun 03 2005 or ....
  - [1.1.0-01gr05]
  - Add enable/disable repository support to configuration page
- * Fri May 31 2005 Gordon Rowell <gordonr@gormand.com.au>
+ * Tue May 31 2005 Gordon Rowell <gordonr@gormand.com.au>
+   Fri May 31 2005 --> Fri May 27 2005 or Tue May 31 2005 or Fri Jun 03 2005 or ....
  - [1.1.0-01gr04]
  - Hide empty group/package select boxes
-Line 898 
 AutoReqProv: no
+Line 1170 
 AutoReqProv: no
  * Thu Jan 22 2004 Darrell May <dmay@myezserver.com>
  - [0.0.1a-01]
  - Original version
- %prep
- %setup
- %build
- perl createlinks
- ln -s /var/service/yum root/service/yum
- mkdir -p root/etc/yum.smerepos.d
- %install
- /bin/rm -rf $RPM_BUILD_ROOT
- (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
- /bin/rm -f %{name}-%{version}-filelist
- /sbin/e-smith/genfilelist \
-     --file '/sbin/e-smith/yum_update_dbs' 'attr(0700,root,root)' \
-     --file '/sbin/e-smith/yum' 'attr(0755,root,root)' \
-     --file '/sbin/e-smith/check4updates' 'attr(0755,root,root)' \
-     --file '/sbin/e-smith/check4contribsupdates' 'attr(0755,root,root)' \
-     --file '/etc/cron.daily/smeserver-yum' 'attr(0700,root,root)' \
-     --file /var/service/yum/down 'attr(0644,root,root)' \
-     --file /var/service/yum/run 'attr(0755,root,root)' \
-     --dir /var/service/yum/log 'attr(0755,root,root)' \
-     --dir /var/service/yum/log/supervise 'attr(0700,root,root)' \
-     --dir /var/service/yum/supervise 'attr(0700,root,root)' \
-     --file /var/service/yum/log/run 'attr(0755,root,root)' \
-     --dir /var/log/yum 'attr(2750,smelog,smelog)' \
-     $RPM_BUILD_ROOT > %{name}-%{version}-%{release}-filelist
- %clean
- /bin/rm -rf $RPM_BUILD_ROOT
- %files -f %{name}-%{version}-%{release}-filelist
- %defattr(-,root,root)

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1