upgrade to new unrar 3.1.3

unrar/unrar.spec

@@ -23,28 +23,25 @@
 ##  SUCH DAMAGE.
 ##
 
-%define       V_real  2.50
-%define       V_src   250
-
 #   package information
 Name:         unrar
 Summary:      Extracting Tool for RAR Format Files
-URL:          ftp://ftp.elf.stuba.sk/pub/pc/pack/
+URL:          http://www.rarlab.com/
 Vendor:       Eugene Roshal
 Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Group:        Archiver
 License:      freely distributable
-Version:      %{V_real}
-Release:      20020321
+Version:      3.1.3
+Release:      20030113
 
 #   list of sources
-Source0:      ftp://ftp.elf.stuba.sk/pub/pc/pack/unrar%{V_src}.zip
+Source0:      http://files10.rarlab.com/rar/unrarsrc-%{version}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, infozip
+BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc
 PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no
@@ -55,26 +52,26 @@ AutoReqProv:  no
     above.
 
 %prep
-    (   cd $RPM_BUILD_DIR
-        rm -rf %{name}-%{version}
-        %{l_prefix}/bin/unzip -q %{SOURCE0}
-    )
+    %setup -q -n unrar
 
 %build
-    (   cd $RPM_BUILD_DIR/%{name}-%{version}/src
-        cflags=""
-        case "%{l_target}" in
-            sparc*-* ) cflags="$cflags -DNON_INTEL_BYTE_ORDER" ;;
-        esac
-        %{l_cc} %{l_cflags -O} $cflags -o unrar unrar.c
-    )
+    cxxflags="-O2"
+    defines="-DUNRAR"
+    case "%{l_target}" in
+        *86*-*   ) defines="$defines -DLITTLE_ENDIAN" ;;
+        sparc*-* ) defines="$defines -DBIG_ENDIAN" ;;
+    esac
+    %{l_make} %{l_mflags -O} -f makefile.unix \
+        CXX="%{l_prefix}/bin/g++" \
+        CXXFLAGS="$cxxflags" \
+        DEFINES="$defines"
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    (   cd $RPM_BUILD_DIR/%{name}-%{version}/src
-        %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
-        %{l_shtool} install -c -s -m 755 unrar $RPM_BUILD_ROOT%{l_prefix}/bin/
-    )
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin
+    %{l_shtool} install -c -s -m 755 \
+        unrar $RPM_BUILD_ROOT%{l_prefix}/bin/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files