From: Paweł Gołaszewski <blues@pld-linux.org>
Date: Wed, 25 Oct 2006 16:29:42 +0000 (+0000)
Subject: - don't print warning about css overwrite, even with quiet options
X-Git-Tag: auto/th/awffull-3_7_5-1~6
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?p=packages%2Fawffull.git;a=commitdiff_plain;h=05e70b00370610ff1f5a5dc988e1b3ec10da7dbb

- don't print warning about css overwrite, even with quiet options

Changed files:
    awffull-no_css_overwrite_warning.patch -> 1.1
    awffull.spec -> 1.13
---

diff --git a/awffull-no_css_overwrite_warning.patch b/awffull-no_css_overwrite_warning.patch
new file mode 100644
index 0000000..bcee1b2
--- /dev/null
+++ b/awffull-no_css_overwrite_warning.patch
@@ -0,0 +1,11 @@
+--- ./src/css_file.c.org	2006-10-11 09:29:04.000000000 +0000
++++ ./src/css_file.c	2006-10-25 16:22:53.000000000 +0000
+@@ -126,7 +126,7 @@
+         sprintf(lineout, "%s\n", css[i]);
+         write_rtn = write(cssfile, lineout, strlen(lineout));
+         if (write_rtn == -1 && css_exists_warning == false && css_created == false) {
+-            ERRVPRINT(VERBOSE0, _("CSS File \"%s\" Exists. Not writing a new one.\n"), css_filename);
++            VPRINT(VERBOSE1, _("CSS File \"%s\" Exists. Not writing a new one.\n"), css_filename);
+             css_exists_warning = true;
+             break;
+         }
diff --git a/awffull.spec b/awffull.spec
index 6b4feba..5cefc7e 100644
--- a/awffull.spec
+++ b/awffull.spec
@@ -13,6 +13,7 @@ Source0:	http://www.stedee.id.au/files/%{name}-%{version}.tar.gz
 Source1:	%{name}.sysconfig
 Source2:	%{name}.cron
 Source3:	%{name}.crontab
+Patch0:		%{name}-no_css_overwrite_warning.patch
 URL:		http://www.stedee.id.au/awffull/
 BuildRequires:	GeoIP-devel > 1.4.0-1
 BuildRequires:	gd-devel
@@ -33,6 +34,7 @@ wykres
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -46,7 +48,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/etc/{sysconfig,cron.d},%{_sbi
 	DESTDIR=$RPM_BUILD_ROOT
 
 install sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install %{name}_history_regen.pl %{_sbindir}
+install %{name}_history_regen.pl $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/%{name}.cron
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}