From ded26fb95782c7cc4ba538c0372c69f891b6f9ea2d07651090bcf517c0904e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 12 Aug 2011 19:00:30 +0000 Subject: [PATCH] Accepting request 78660 from home:jengelh:dev - Change compression scheme to xz. This should give smaller resulting filesizes. OBS-URL: https://build.opensuse.org/request/show/78660 OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=14 --- logrotate-3.7.8-autoext.patch | 3 ++- logrotate-3.7.8-conf.patch | 6 +++--- logrotate.changes | 5 +++++ logrotate.spec | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/logrotate-3.7.8-autoext.patch b/logrotate-3.7.8-autoext.patch index 931d8b3..a9a187c 100644 --- a/logrotate-3.7.8-autoext.patch +++ b/logrotate-3.7.8-autoext.patch @@ -34,7 +34,7 @@ Index: logrotate.c =================================================================== --- logrotate.c.orig 2008-10-15 15:07:43.000000000 +0200 +++ logrotate.c 2009-03-06 14:21:45.000000000 +0100 -@@ -54,6 +54,15 @@ +@@ -54,6 +54,16 @@ int numLogs = 0; int debug = 0; char *mailCommand = DEFAULT_MAIL_COMMAND; @@ -42,6 +42,7 @@ Index: logrotate.c +const char * compress_cmd_list[][2] = { + {"gzip", ".gz"}, + {"bzip2", ".bz2"}, ++ {"xz", ".xz"}, + {"compress", ".Z"}, + {"zip", "zip"}, + {"EOLIST", "EOLIST"} /* end-marker */ diff --git a/logrotate-3.7.8-conf.patch b/logrotate-3.7.8-conf.patch index 9fe8ed4..89a9b57 100644 --- a/logrotate-3.7.8-conf.patch +++ b/logrotate-3.7.8-conf.patch @@ -18,8 +18,8 @@ Index: examples/logrotate-default -} +# comment these to switch compression to use gzip or another +# compression scheme -+compresscmd /usr/bin/bzip2 -+uncompresscmd /usr/bin/bunzip2 ++compresscmd /usr/bin/xz ++uncompresscmd /usr/bin/xzdec -/var/log/btmp { - missingok @@ -28,7 +28,7 @@ Index: examples/logrotate-default - rotate 1 -} +# former versions had to have the compressext set accordingly -+#compressext .bz2 ++#compressext .xz -# system-specific logs may be also be configured here. +# RPM packages drop log rotation information into this directory diff --git a/logrotate.changes b/logrotate.changes index fb4dee3..e9bcd1e 100644 --- a/logrotate.changes +++ b/logrotate.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 25 10:25:56 UTC 2011 - jengelh@medozas.de + +- Change compression scheme to xz + ------------------------------------------------------------------- Tue May 10 14:23:08 UTC 2011 - puzel@novell.com diff --git a/logrotate.spec b/logrotate.spec index 27a6333..6013572 100644 --- a/logrotate.spec +++ b/logrotate.spec @@ -39,7 +39,7 @@ BuildRequires: popt-devel PreReq: %fillup_prereq PreReq: /bin/mv PreReq: /bin/rm -Requires: bzip2 +Requires: xz Requires: cron BuildRoot: %{_tmppath}/%{name}-%{version}-build