- up to 0.78

Changed files:
    squidview-curses,howto-dest.patch -> 1.3
    squidview-pld.patch -> 1.5
    squidview.spec -> 1.24

diff --git a/squidview-curses,howto-dest.patch b/squidview-curses,howto-dest.patch
index 31d2b93d7f54ce5bb1107d363d45d55f51959253..3b5bb8902e04cfc68548ee62c2270ff6d409a916 100644 (file)
--- a/squidview-curses,howto-dest.patch
+++ b/squidview-curses,howto-dest.patch
@@ -1,12 +1,20 @@
-diff -Nur old/configure.in new/configure.in
---- old/configure.in   2003-11-21 03:28:44.000000000 +0000
-+++ new/configure.in   2003-11-28 22:30:27.000000000 +0000
-@@ -4,7 +4,7 @@
+--- squidview-0.78/configure.in.orig   2011-01-20 03:22:46.000000000 +0100
++++ squidview-0.78/configure.in        2011-02-02 23:59:12.335738189 +0100
+@@ -5,7 +5,7 @@ if test "x$sv_curses" = xno; then
+   sv_pass="no"
+   AC_MSG_CHECKING([name is $sv_test])
+   LIBS="-l$sv_test"
+-  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [initscr();])],
++  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses/curses.h>], [initscr();])],
+     [sv_pass="yes"])
+   AC_MSG_RESULT([$sv_pass])
+   test "$sv_pass" = yes && sv_curses=$sv_test
+@@ -19,7 +19,7 @@ AM_INIT_AUTOMAKE(squidview,0.78)
  AC_PROG_CXX
  AC_PROG_INSTALL
  
--AC_CHECK_HEADERS(curses.h signal.h sys/time.h sys/types.h sys/stat.h \
+-AC_CHECK_HEADERS(curses.h, signal.h sys/time.h sys/types.h sys/stat.h \
 +AC_CHECK_HEADERS(ncurses/curses.h signal.h sys/time.h sys/types.h sys/stat.h \
-  unistd.h fcntl.h time.h stdlib.h math.h,, \
+  unistd.h fcntl.h time.h stdlib.h math.h stdio.h,, \
   AC_MSG_ERROR([header missing]))
- AC_CHECK_LIB(ncurses, wgetch,,AC_MSG_ERROR([recent ncurses installed?]))
+ 

diff --git a/squidview-pld.patch b/squidview-pld.patch
index 054c23a0d8c69966a0a546b7d00fa0f84e1e79b4..80241fdaa5ad1b12449b9636db65c240c3abdecb 100644 (file)
--- a/squidview-pld.patch
+++ b/squidview-pld.patch
@@ -22,8 +22,8 @@ diff -Nur old/squidview.cpp new/squidview.cpp
      }
    }
    else
--    RunProgram (sViewer + " " + sHowToLink);
-+    RunProgram (sZipViewer + " " + sHowToLink);
+-    RunProgramInConsole (sViewer + " " + sHowToLink);
++    RunProgramInConsole (sZipViewer + " " + sHowToLink);
  }
  
  

diff --git a/squidview.spec b/squidview.spec
index 175334cfb58df559e9cd0587149fc95ee2bea21b..cc42f28e26fe3b79dd63105460e845a12aebfd99 100644 (file)
--- a/squidview.spec
+++ b/squidview.spec
@@ -1,12 +1,12 @@
 Summary:       A console program to nicely view squid's log
 Summary(pl.UTF-8):     Konsolowy program pozwalający oglądać logi squida
 Name:          squidview
-Version:       0.73
+Version:       0.78
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://www.rillion.net/squidview/%{name}-%{version}.tar.gz
-# Source0-md5: e6e6c6986ee3bf9160b7e5d9beaa69a0
+# Source0-md5: 70d752609926207e58fc824d26def4e4
 Patch0:                %{name}-pld.patch
 Patch1:                %{name}-curses,howto-dest.patch
 URL:           http://www.rillion.net/squidview/
@@ -39,7 +39,8 @@ i trafienia cache-a.
 %{__automake}
 %configure
 %{__make} \
-       CXXFLAGS="-I/usr/include/ncurses"
+       CXXFLAGS="-I/usr/include/ncurses" \
+       LIBS="-lncurses -ltinfo"
 
 %install
 rm -rf $RPM_BUILD_ROOT