Hello community, here is the log from the commit of package unrar checked in at Sun Dec 17 12:21:48 CET 2006. -------- --- unrar/unrar.changes 2006-12-15 12:25:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/unrar/unrar.changes 2006-12-15 20:20:39.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 15 20:15:27 CET 2006 - lmichnovic@suse.cz + +- corrected and readded reverted *strcmp.patch + +------------------------------------------------------------------- New: ---- unrarsrc-3.6.8-strcmp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.8dujKI/_old 2006-12-17 12:21:40.000000000 +0100 +++ /var/tmp/diff_new_pack.8dujKI/_new 2006-12-17 12:21:40.000000000 +0100 @@ -13,7 +13,7 @@ Name: unrar BuildRequires: gcc-c++ Version: 3.60.8 -Release: 22 +Release: 24 Autoreqprov: on Group: Productivity/Archiving/Compression License: Freely Redistributable Software (FSR), Other License(s), see package @@ -22,6 +22,7 @@ Source: %{name}src-3.6.8.tar.bz2 Patch: %{name}src-3.6.8-types.patch Patch1: %{name}src-3.6.8-gcc.patch +Patch2: %{name}src-3.6.8-strcmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,6 +40,7 @@ %setup -q -n %{name} %patch0 %patch1 +%patch2 %build make -f makefile.unix CXXFLAGS="$RPM_OPT_FLAGS -Wall -fmessage-length=0 -fno-strict-aliasing -fstack-protector" STRIP=true @@ -56,6 +58,8 @@ %{_bindir}/* %changelog -n unrar +* Fri Dec 15 2006 - lmichnovic@suse.cz +- corrected and readded reverted *strcmp.patch * Fri Dec 15 2006 - mmarek@suse.cz - revert last change (it worked previously and the strcmp patch breaks --help output) ++++++ unrarsrc-3.6.8-strcmp.patch ++++++ --- cmddata.cpp +++ cmddata.cpp @@ -1,3 +1,4 @@ +#include <string.h> #include "rar.hpp" CommandData::CommandData() @@ -911,15 +912,15 @@ continue; #endif #ifndef _WIN_32 - if (Help[I]==MCHelpSwRI) + if (0 == strncmp(Help[I], "MCHelpSwRI", 10)) continue; #endif #ifndef PACK_SMP - if (Help[I]==MCHelpSwMT) + if (0 == strncmp(Help[I], "MCHelpSwMT", 10)) continue; #endif #ifndef _BEOS - if (Help[I]==MCHelpSwEE) + if (0 == strncmp(Help[I], "MCHelpSwEE", 10)) { #if defined(_EMX) && !defined(_DJGPP) if (_osmode != OS2_MODE) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org