upgrade to 1.5.18 and cleanup packaging

tin/tin.spec

@@ -23,6 +23,10 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_major   1.5
+%define       V_minor   18
+
 #   package information
 Name:         tin
 Summary:      News User Agent
@@ -32,18 +36,18 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        News
 License:      GPL
-Version:      1.5.17
-Release:      20030408
+Version:      %{V_major}.%{V_minor}
+Release:      20030603
 
 #   list of sources
-Source0:      ftp://ftp.tin.org/pub/news/clients/tin/v1.5/tin-%{version}.tar.bz2
+Source0:      ftp://ftp.tin.org/pub/news/clients/tin/v%{V_major}/tin-%{version}.tar.bz2
 Patch0:       tin.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, ncurses, libiconv, make, flex, bison
-PreReq:       OpenPKG, openpkg >= 20020206, ncurses, libiconv
+BuildPreReq:  OpenPKG, openpkg >= 20030103, ncurses, libiconv, make, flex, bison
+PreReq:       OpenPKG, openpkg >= 20030103, ncurses, libiconv
 AutoReq:      no
 AutoReqProv:  no
 
@@ -52,12 +56,12 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch0 -p0
+    %patch -p0
 
 %build
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -I%{l_prefix}/include/ncurses" \
-    LDFLAGS="-L%{l_prefix}/lib" \
+    CFLAGS="%{l_cflags -O} %{l_cppflags ncurses}" \
+    LDFLAGS="%{l_ldflags}" \
     LIBS="-liconv" \
     ./configure \
         --prefix=%{l_prefix} \
@@ -76,10 +80,13 @@ AutoReqProv:  no
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
-    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man1
-    %{l_shtool} install -c -s -m 755 src/tin $RPM_BUILD_ROOT%{l_prefix}/bin/
-    %{l_shtool} install -c -m 644 doc/tin.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1
+    %{l_shtool} install -c -s -m 755 \
+        src/tin $RPM_BUILD_ROOT%{l_prefix}/bin/
+    %{l_shtool} install -c -m 644 \
+        doc/tin.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files