upgrading package: rc 1.6c7 -> 1.7

rc/rc.spec

@@ -32,17 +32,16 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EXP]
 Group:        Converter
 License:      GPL
-Version:      1.6c7
-Release:      20020522
+Version:      1.7
+Release:      20020621
 
 #   list of sources
-Source0:      http://www.star.le.ac.uk/~tjg/rc/beta/rc-%{version}.tar.gz
-Source1:      http://www.star.le.ac.uk/~tjg/rc/misc/vrl-1.3.tar.gz
+Source0:      http://www.star.le.ac.uk/~tjg/rc/release/rc-%{version}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20020206, readline
 PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no
@@ -53,32 +52,20 @@ AutoReqProv:  no
     Bourne shell, but with a much cleaner syntax.
 
 %prep
-    %setup0 -q -c -a 0
-    %setup1 -q -T -D -a 1
+    %setup0 -q
 
 %build
-    ( cd vrl-1.3
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      ./configure \
-          --prefix=%{l_prefix}
-      %{l_make} %{l_mflags -O}
-    )
-    ( cd rc-%{version}
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O} -I`pwd`/../vrl-1.3" \
-      LDFLAGS="-L`pwd`/../vrl-1.3" \
-      ./configure \
-          --prefix=%{l_prefix} \
-          --with-vrl
-      %{l_make} %{l_mflags -O}
-    )
+    CC="%{l_cc}" \
+    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
+    LDFLAGS="-L%{l_prefix}/lib" \
+    ./configure \
+        --prefix=%{l_prefix} \
+        --with-readline
+    %{l_make} %{l_mflags -O}
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    ( cd rc-%{version}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-    )
+    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}