commit ad4ae8b8534966a2b59b4ec62ea9d2b2691f4c3f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Oct 26 13:44:20 2020 +0000
Update to 6.0.1
.gitignore | 1 +
sources | 2 +-
unrar-5.9.4-build.patch => unrar-6.0.1-build.patch | 16 ++++++++++++++++
unrar.spec | 18 +++++++++---------
4 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ae57ac..77e6d73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ unrarsrc-5.2.3.tar.gz
/unrarsrc-5.9.2.tar.gz
/unrarsrc-5.9.3.tar.gz
/unrarsrc-5.9.4.tar.gz
+/unrarsrc-6.0.1.tar.gz
diff --git a/sources b/sources
index 814c98c..fc48e1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (unrarsrc-5.9.4.tar.gz) =
4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
+SHA512 (unrarsrc-6.0.1.tar.gz) =
2c88dd05252237d7d62ad34332673ac9e457bb43b0ed980be977d557d0deb3d5bd19372d41ac2e254d94e20ecb1ca62b1c15781320cf231f2a7bfa12fe176d8a
diff --git a/unrar-5.9.4-build.patch b/unrar-6.0.1-build.patch
similarity index 66%
rename from unrar-5.9.4-build.patch
rename to unrar-6.0.1-build.patch
index ae5ca0b..e34b6f3 100644
--- a/unrar-5.9.4-build.patch
+++ b/unrar-6.0.1-build.patch
@@ -8,6 +8,21 @@ Gentoo-Bug:
https://bugs.gentoo.org/528218
--- a/makefile
+++ b/makefile
+@@ -3,12 +3,12 @@
+
+ # Linux using GCC
+ CXX=c++
+-CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
++CXXFLAGS=$(RPM_OPT_FLAGS) -fPIC -DPIC -Wno-parentheses -Wno-switch -Wno-sign-compare
-Wno-class-memaccess -Wno-unused-variable -Wno-unused-function -Wno-dangling-else
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+ AR=ar
+-LDFLAGS=-pthread
++LDFLAGS=$(RPM_LD_FLAGS) -pthread
+ DESTDIR=/usr
+
+ # Linux using LCC
@@ -142,21 +142,18 @@
@rm -f $(OBJECTS) $(UNRAR_OBJ) $(LIB_OBJ)
@rm -f unrar libunrar.*
@@ -33,3 +48,4 @@ Gentoo-Bug:
https://bugs.gentoo.org/528218
$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
+
diff --git a/unrar.spec b/unrar.spec
index fa78af7..9dc330a 100644
--- a/unrar.spec
+++ b/unrar.spec
@@ -1,13 +1,13 @@
Name: unrar
-Version: 5.9.4
-Release: 3%{?dist}
+Version: 6.0.1
+Release: 1%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
License: Freeware with further limitations
URL:
https://www.rarlab.com/rar_add.htm
Source0:
https://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz
# Man page from Debian
Source1: unrar.1
-Patch0: unrar-5.9.4-build.patch
+Patch0: unrar-6.0.1-build.patch
BuildRequires: gcc-c++
@@ -43,13 +43,10 @@ developing applications that use libunrar.
cp -p %SOURCE1 .
%build
-%{make_build} -f makefile unrar \
- CXX="%{__cxx}" CXXFLAGS="%{optflags} -fPIC -DPIC"
LDFLAGS="%{?__global_ldflags} -pthread" \
- STRIP=:
+%set_build_flags
+%make_build -f makefile unrar STRIP=:
-%{make_build} -f makefile lib \
- CXX="%{__cxx}" CXXFLAGS="%{optflags} -fPIC -DPIC"
LDFLAGS="%{?__global_ldflags} -pthread" \
- STRIP=:
+%make_build -f makefile lib STRIP=:
%install
@@ -92,6 +89,9 @@ touch -r license.txt %{buildroot}%{_sysconfdir}/rpm/macros.unrar
%changelog
+* Mon Oct 26 2020 Leigh Scott <leigh123linux(a)gmail.com> - 6.0.1-1
+- Update to 6.0.1
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
5.9.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild