- added gcc3 patch, new %%doc, release 2

Changed files:
    unrar-gcc3.patch -> 1.1
    unrar.spec -> 1.27

diff --git a/unrar-gcc3.patch b/unrar-gcc3.patch
new file mode 100644 (file)
index 0000000..e01fd28
--- /dev/null
+++ b/unrar-gcc3.patch
@@ -0,0 +1,18 @@
+--- unrar-3.00/rartypes.hpp.orig       Tue May 14 14:41:23 2002
++++ unrar-3.00/rartypes.hpp    Sun Oct 13 16:33:41 2002
+@@ -8,7 +8,7 @@
+ typedef unsigned int     uint32; //32 bits exactly
+ #define PRESENT_INT32
+ 
+-#ifdef _WIN_32
++#if defined(_WIN_32) || (defined(__GNUC__) && __GNUC__ >= 3)
+ typedef wchar_t wchar;
+ #elif defined(__GNUC__)
+ typedef __wchar_t wchar;
+@@ -18,4 +18,4 @@
+ 
+ #define SHORT16(x) (sizeof(ushort)==2 ? (ushort)(x):((x)&0xffff))
+ 
+-#endif
+\ No newline at end of file
++#endif

diff --git a/unrar.spec b/unrar.spec
index 4ac47b7659c2c1da36ca16ef6affff56e38b3ec5..ced11cfef6521b593750b66ee611fff379669eaa 100644 (file)
--- a/unrar.spec
+++ b/unrar.spec
@@ -5,14 +5,15 @@ Summary(ru):  
 Summary(uk):   òÏÚÐÁËÏ×Õ×ÁÞ ÆÁÊÌ¦× .zip
 Name:          unrar
 Version:       3.00
-Release:       1
+Release:       2
 License:       Freeware
 Group:         Applications/Archiving
 Source0:       http://www.rarlab.com/rar/%{name}src.tar.gz
 Source1:       %{name}.1
 Source2:       %{name}.1.pl
 Patch0:                %{name}-makefile.patch
-BuildRequires: gcc-c++
+Patch1:                %{name}-gcc3.patch
+BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,6 +48,7 @@ PKZIP 
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} -f makefile.gcc CC=%{__cc} CXX=%{__cxx} OPT="%{rpmcflags}"
@@ -58,14 +60,13 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/{man1,pl/man1}}
 install unrar $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
 install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1
-gzip -9nf *.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt.gz
+%doc *.txt
 %{_mandir}/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 %attr(755,root,root) %{_bindir}/*