- don't quiet automatically if not ran from terminal; rel 4

Changed files:
    no-autosilent.patch -> 1.1
    pisg.spec -> 1.20

diff --git a/no-autosilent.patch b/no-autosilent.patch
new file mode 100644 (file)
index 0000000..8d1d752
--- /dev/null
+++ b/no-autosilent.patch
@@ -0,0 +1,14 @@
+--- pisg-0.72/pisg~    2009-09-14 14:45:19.000000000 +0300
++++ pisg-0.72/pisg     2009-09-14 14:46:20.641778357 +0300
+@@ -25,11 +25,6 @@
+ sub main
+ {
+     my $script_dir = '/usr/share/pisg';
+-
+-    if (!-t STDOUT) { # we are not writing to a terminal
+-      push @ARGV, "--silent";
+-    }
+-
+     my $cfg = get_cmdline_options($script_dir);
+     unshift(@INC, $cfg->{modules_dir});
+ 

diff --git a/pisg.spec b/pisg.spec
index edfc9c81361fec90aa14dd8ccb07ecf3ecdc1a41..ad4400e18f84c5235ef29a75d147ace31ef98fb8 100644 (file)
--- a/pisg.spec
+++ b/pisg.spec
@@ -2,7 +2,7 @@ Summary:        Perl script which generates statistics from IRC logfiles
 Summary(pl.UTF-8):     Skrypt perlowy generujący statystyki z plików logujących IRC-a
 Name:          pisg
 Version:       0.72
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://dl.sourceforge.net/pisg/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@ Patch0:               %{name}-config.patch
 Patch1:                %{name}-FHS.patch
 Patch2:                %{name}-lang.patch
 Patch3:                %{name}-hacks.patch
+Patch4:                no-autosilent.patch
 URL:           http://pisg.sourceforge.net/
 Suggests:      perl-Text-Iconv
 BuildArch:     noarch
@@ -36,6 +37,7 @@ dokumentacja znajduje się na: <http://pisg.sourceforge.net/docs/>.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 mv docs/pisg.1 .
 
@@ -49,7 +51,7 @@ cp -a pisg.1 $RPM_BUILD_ROOT%{_mandir}/man1
 cp -a pisg.cfg $RPM_BUILD_ROOT%{_sysconfdir}/pisg
 cp -a gfx layout lang.txt $RPM_BUILD_ROOT%{_datadir}/pisg
 cp -a modules/* $RPM_BUILD_ROOT%{perl_vendorlib}
-install pisg $RPM_BUILD_ROOT%{_bindir}
+install -p pisg $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT