Hello community, here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2013-06-13 22:45:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old) and /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unrar" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2013-06-05 14:24:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2013-06-13 22:45:30.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 12 20:26:22 UTC 2013 - [email protected] + +- Update to 5.0.6 + * No changelog available +- Drop unrarsrc-4.2.4-gcc.patch, not needed anymore + +------------------------------------------------------------------- Old: ---- unrarsrc-4.2.4-gcc.patch unrarsrc-5.0.5.tar.gz New: ---- unrarsrc-5.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.t7DImD/_old 2013-06-13 22:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.t7DImD/_new 2013-06-13 22:45:31.000000000 +0200 @@ -18,10 +18,10 @@ # majorversion should match the major version number. %define majorversion 5 -%define libsuffix 5_0_5 +%define libsuffix 5_0_6 Name: unrar -Version: 5.0.5 +Version: 5.0.6 Release: 0 License: SUSE-NonFree Summary: A program to extract, test, and view RAR archives @@ -30,9 +30,7 @@ Source0: http://www.rarlab.com/rar/%{name}src-%{version}.tar.gz Source1: unrar.1 Patch1: unrarsrc-3.9-types.patch -# PATCH-NEEDS-REBASE unrarsrc-4.2.4-gcc.patch -- fix for old gcc version -Patch2: unrarsrc-4.2.4-gcc.patch -Patch4: unrarsrc-5.0.5-soname.patch +Patch2: unrarsrc-5.0.5-soname.patch BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,8 +60,7 @@ %prep %setup -q -n %{name} %patch1 -#%%patch2 -%patch4 -p1 +%patch2 -p1 %build make %{?_smp_mflags} -f makefile CXXFLAGS="%{optflags} \ ++++++ unrarsrc-5.0.5.tar.gz -> unrarsrc-5.0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/UnRARDll.vcproj new/unrar/UnRARDll.vcproj --- old/unrar/UnRARDll.vcproj 2013-02-02 16:06:38.000000000 +0100 +++ new/unrar/UnRARDll.vcproj 2013-06-03 09:52:00.000000000 +0200 @@ -570,6 +570,10 @@ > </File> <File + RelativePath=".\blake2s.cpp" + > + </File> + <File RelativePath="cmddata.cpp" > </File> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/arcread.cpp new/unrar/arcread.cpp --- old/unrar/arcread.cpp 2013-05-27 15:33:33.000000000 +0200 +++ new/unrar/arcread.cpp 2013-06-03 09:47:46.000000000 +0200 @@ -1279,7 +1279,7 @@ // This code must be performed only after other path separator checks, // because it produces backslashes illegal for some of checks above. // Backslash is allowed in file names in Unix, but not in Windows. - // Still, RAR 4.x use backslashes as path separator even in Unix. + // Still, RAR 4.x uses backslashes as path separator even in Unix. // Forward slash is not allowed in both systems. In RAR 5.0 we use // the forward slash as universal path separator. if (*s=='/' || *s=='\\' && Format!=RARFMT50) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/cmddata.cpp new/unrar/cmddata.cpp --- old/unrar/cmddata.cpp 2013-05-27 15:33:33.000000000 +0200 +++ new/unrar/cmddata.cpp 2013-06-03 09:47:46.000000000 +0200 @@ -217,13 +217,17 @@ // Ensure that correct log file name is already set // if we need to report an error when processing the command line. ProcessSwitch(Switch); - InitLogOptions(LogName); + InitLogOptions(LogName,ErrlogCharset); } #endif if (wcsnicomp(Switch,L"sc",2)==0) { // Process -sc before reading any file lists. ProcessSwitch(Switch); +#ifndef GUI + if (*LogName!=0) + InitLogOptions(LogName,ErrlogCharset); +#endif } } return true; @@ -738,7 +742,7 @@ }; if (!AlreadyBad) if (Switch[3]==0) - CommentCharset=FilelistCharset=rch; + CommentCharset=FilelistCharset=ErrlogCharset=rch; else for (uint I=3;Switch[I]!=0 && !AlreadyBad;I++) switch(toupperw(Switch[I])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc --- old/unrar/dll.rc 2013-05-27 09:09:38.000000000 +0200 +++ new/unrar/dll.rc 2013-06-03 09:37:36.000000000 +0200 @@ -2,8 +2,8 @@ #include <commctrl.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 5, 0, 4, 878 -PRODUCTVERSION 5, 0, 4, 878 +FILEVERSION 5, 0, 5, 885 +PRODUCTVERSION 5, 0, 5, 885 FILEOS VOS__WINDOWS32 FILETYPE VFT_APP { @@ -14,8 +14,8 @@ VALUE "CompanyName", "Alexander Roshal\0" VALUE "ProductName", "RAR decompression library\0" VALUE "FileDescription", "RAR decompression library\0" - VALUE "FileVersion", "5.0.4\0" - VALUE "ProductVersion", "5.0.4\0" + VALUE "FileVersion", "5.0.5\0" + VALUE "ProductVersion", "5.0.5\0" VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2013\0" VALUE "OriginalFilename", "Unrar.dll\0" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/log.cpp new/unrar/log.cpp --- old/unrar/log.cpp 2013-05-27 15:33:34.000000000 +0200 +++ new/unrar/log.cpp 2013-06-03 09:47:46.000000000 +0200 @@ -2,10 +2,12 @@ static wchar LogName[NM]; +static RAR_CHARSET LogCharset=RCH_DEFAULT; -void InitLogOptions(const wchar *LogFileName) +void InitLogOptions(const wchar *LogFileName,RAR_CHARSET CSet) { wcsncpyz(LogName,LogFileName,ASIZE(LogName)); + LogCharset=CSet; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/log.hpp new/unrar/log.hpp --- old/unrar/log.hpp 2013-05-27 15:33:34.000000000 +0200 +++ new/unrar/log.hpp 2013-06-03 09:47:46.000000000 +0200 @@ -1,7 +1,7 @@ #ifndef _RAR_LOG_ #define _RAR_LOG_ -void InitLogOptions(const wchar *LogFileName); +void InitLogOptions(const wchar *LogFileName,RAR_CHARSET CSet); #ifdef SILENT inline void Log(const wchar *ArcName,const wchar *fmt,...) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/options.hpp new/unrar/options.hpp --- old/unrar/options.hpp 2013-05-27 15:33:34.000000000 +0200 +++ new/unrar/options.hpp 2013-06-03 09:47:46.000000000 +0200 @@ -94,6 +94,8 @@ wchar CommentFile[NM]; RAR_CHARSET CommentCharset; RAR_CHARSET FilelistCharset; + RAR_CHARSET ErrlogCharset; + wchar ArcPath[NM]; SecPassword Password; bool EncryptHeaders; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/rar.cpp new/unrar/rar.cpp --- old/unrar/rar.cpp 2013-05-27 15:33:34.000000000 +0200 +++ new/unrar/rar.cpp 2013-06-03 09:47:46.000000000 +0200 @@ -83,7 +83,7 @@ #endif InitConsoleOptions(Cmd->MsgStream,Cmd->Sound); - InitLogOptions(Cmd->LogName); + InitLogOptions(Cmd->LogName,Cmd->ErrlogCharset); ErrHandler.SetSilent(Cmd->AllYes || Cmd->MsgStream==MSG_NULL); ErrHandler.SetShutdown(Cmd->Shutdown); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/unicode.cpp new/unrar/unicode.cpp --- old/unrar/unicode.cpp 2013-05-27 15:33:34.000000000 +0200 +++ new/unrar/unicode.cpp 2013-06-03 09:47:47.000000000 +0200 @@ -207,7 +207,7 @@ if (*Src==0) break; } - return(Dest); + return Dest; } @@ -216,7 +216,7 @@ for (size_t I=0;I<DestSize;I++) if ((Dest[I]=Src[I*2]+(Src[I*2+1]<<8))==0) break; - return(Dest); + return Dest; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp --- old/unrar/version.hpp 2013-05-27 15:33:34.000000000 +0200 +++ new/unrar/version.hpp 2013-06-03 09:47:47.000000000 +0200 @@ -1,6 +1,6 @@ #define RARVER_MAJOR 5 #define RARVER_MINOR 0 -#define RARVER_BETA 4 -#define RARVER_DAY 27 -#define RARVER_MONTH 5 +#define RARVER_BETA 5 +#define RARVER_DAY 3 +#define RARVER_MONTH 6 #define RARVER_YEAR 2013 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
