Hello community, here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2012-10-22 22:12:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old) and /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unrar", Maintainer is "vdziewie...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2011-09-23 15:03:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2012-10-22 22:12:54.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Oct 19 19:01:52 UTC 2012 - cfarr...@suse.com + +- license update: SUSE-NonFree + The description of SUSE-Permissive on the spreadsheet linked from + license.opensuse.org would imply that such a licensed software would be + suitable for Factory. For unrar this is clearly not the case - hence + SUSE-NonFree + +------------------------------------------------------------------- +Fri Oct 12 19:43:44 UTC 2012 - lazy.k...@opensuse.org + +- Update to 4.2.4. + * No changelog provided. +- Add unrar-4.2.4-no_return.patch: fix no-return-in-nonvoid-function + error. +- Change License tag: SUSE-Permissive. +- Use full URL as a source. +- Update "unrarsrc-*-gcc" and "unrarsrc-*-soname" patches. +- Correct libunrar Group: System/Libraries. +- Remove Provides: libunrar3_9_10-devel (no dependent packages + found). +- Update man page. +- Mark man as doc. +- Clean up and formatting spec. + +------------------------------------------------------------------- Old: ---- unrarsrc-3.9-gcc.patch unrarsrc-3.9-soname.patch unrarsrc-4.0.4.tar.bz2 New: ---- unrar-4.2.4-no_return.patch unrarsrc-4.2.4-gcc.patch unrarsrc-4.2.4-soname.patch unrarsrc-4.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.CvgiOn/_old 2012-10-22 22:12:55.000000000 +0200 +++ /var/tmp/diff_new_pack.CvgiOn/_new 2012-10-22 22:12:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package unrar # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,27 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # majorversion should match the major version number. %define majorversion 4 -%define libsuffix 4_0_4 +%define libsuffix 4_2_4 Name: unrar -BuildRequires: gcc-c++ -Version: 4.0.4 -Release: 6 -Group: Productivity/Archiving/Compression -License: Unrar License. Freely distributable -#http://www.rarlab.com/rar/unrarsrc-%%{version}.tar.gz -Url: http://www.rarlab.com +Version: 4.2.4 +Release: 0 +License: SUSE-NonFree Summary: A program to extract, test, and view RAR archives -Source: %{name}src-%{version}.tar.bz2 +Url: http://www.rarlab.com +Group: Productivity/Archiving/Compression +Source0: http://www.rarlab.com/rar/%{name}src-%{version}.tar.gz Source1: unrar.1 Patch1: unrarsrc-3.9-types.patch -Patch2: unrarsrc-3.9-gcc.patch +Patch2: unrarsrc-4.2.4-gcc.patch Patch3: unrarsrc-3.9-variablesize.patch -Patch4: unrarsrc-3.9-soname.patch +Patch4: unrarsrc-4.2.4-soname.patch +# PATCH-FIX-UPSTREAM unrar-4.2.4-no_return.patch lazy.k...@opensuse.org -- fix no-return-in-nonvoid-function error +Patch5: unrar-4.2.4-no_return.patch +BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,28 +43,19 @@ and developed for extracting, testing, and viewing the contents of archives created with the RAR archiver. -Authors: --------- - Eugene Roshal <ros...@creabel.com> - %package -n libunrar%{libsuffix} - -License: Unrar License. Freely distributable Summary: Decompress library for RAR v3 archives -Group: Productivity/Archiving/Compression +Group: System/Libraries %description -n libunrar%{libsuffix} The libunrar library allows programs linking against it to decompress existing RAR v3 archives. - %package -n libunrar-devel -License: Unrar License. Freely distributable Summary: Development files for libunrar Group: Development/Libraries/C and C++ -Requires: libunrar%{libsuffix} = %{version}-%{release} -Provides: libunrar3_9_10-devel +Requires: libunrar%{libsuffix} = %{version} %description -n libunrar-devel The libunrar-devel package contains libraries and header files for @@ -76,26 +67,28 @@ %patch2 %patch3 %patch4 +%patch5 %build -make -j %{?jobs} -f makefile.unix CXXFLAGS="$RPM_OPT_FLAGS -Wall -fPIC \ - -fmessage-length=0 -fno-strict-aliasing -fstack-protector" STRIP=true +make %{?_smp_mflags} -f makefile.unix CXXFLAGS="%{optflags} -Wall \ + -fPIC -fmessage-length=0 -fno-strict-aliasing -fstack-protector" \ + STRIP=true #bnc#693890 rm -f *.o -make -j %{?jobs} -f makefile.unix lib libversion=%{version} CXXFLAGS="$RPM_OPT_FLAGS -Wall -fPIC \ - -fmessage-length=0 -fno-strict-aliasing -fstack-protector" STRIP=true +make %{?_smp_mflags} -f makefile.unix lib libversion=%{version} \ + CXXFLAGS="%{optflags} -Wall -fPIC -fmessage-length=0 \ + -fno-strict-aliasing -fstack-protector" STRIP=true %install -install -Dm 755 unrar $RPM_BUILD_ROOT%{_bindir}/unrar -install -Dm 644 %{S:1} %{buildroot}%{_mandir}/man1/unrar.1 -install -Dm 755 libunrar.so.%{version} %{buildroot}%{_libdir}/libunrar.so.%{version} -install -Dm 644 dll.hpp %{buildroot}/%{_includedir}/unrar/dll.hpp -ln -s libunrar.so.%{version} %{buildroot}%{_libdir}/libunrar.so.%{majorversion} +install -Dm 0755 unrar %{buildroot}%{_bindir}/unrar +install -Dm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/unrar.1 +install -Dm 0755 libunrar.so.%{version} \ + %{buildroot}%{_libdir}/libunrar.so.%{version} +install -Dm 0644 dll.hpp %{buildroot}/%{_includedir}/unrar/dll.hpp +ln -s libunrar.so.%{version} \ + %{buildroot}%{_libdir}/libunrar.so.%{majorversion} ln -s libunrar.so.%{majorversion} %{buildroot}%{_libdir}/libunrar.so -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libunrar%{libsuffix} -p /sbin/ldconfig %postun -n libunrar%{libsuffix} -p /sbin/ldconfig @@ -104,7 +97,7 @@ %defattr(-,root,root) %doc license.txt readme.txt %{_bindir}/unrar -%{_mandir}/man1/unrar.1* +%doc %{_mandir}/man1/unrar.1* %files -n libunrar%{libsuffix} %defattr(-,root,root) ++++++ unrar-4.2.4-no_return.patch ++++++ Index: dll.cpp =================================================================== --- dll.cpp.orig +++ dll.cpp @@ -102,6 +102,7 @@ HANDLE PASCAL RAROpenArchiveEx(struct RA r->OpenResult=ERAR_NO_MEMORY; if (Data != NULL) delete Data; + return(NULL); } } ++++++ unrar.1 ++++++ --- /var/tmp/diff_new_pack.CvgiOn/_old 2012-10-22 22:12:55.000000000 +0200 +++ /var/tmp/diff_new_pack.CvgiOn/_new 2012-10-22 22:12:55.000000000 +0200 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH UNRAR "1" "January 2011" "unrar " "User Commands" +.TH UNRAR "1" "October 2012" "unrar " "User Commands" .SH NAME -unrar \- manual page for unrar +unrar \- manual page for unrar .SH SYNOPSIS .B unrar -\fI<command> -<switch 1> -<switch N> <archive> <files\fR...\fI>\fR +\fI<command> <switch 1> <switch N> <archive> <files\fR...\fI>\fR .SH DESCRIPTION -UNRAR 4.00 beta 4 freeware Copyright (c) 1993\-2011 Alexander Roshal +UNRAR 4.20 freeware Copyright (c) 1993\-2012 Alexander Roshal .IP <@listfiles...> <path_to_extract\e> .PP @@ -35,6 +35,9 @@ \- Stop switches scanning .TP +\-@[+] +Disable [enable] file lists +.TP \-ad Append archive name to destination path .TP @@ -151,4 +154,3 @@ .TP \-y Assume Yes on all queries -.PP ++++++ unrarsrc-3.9-gcc.patch -> unrarsrc-4.2.4-gcc.patch ++++++ --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrarsrc-3.9-gcc.patch 2011-09-23 15:03:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrarsrc-4.2.4-gcc.patch 2012-10-22 22:12:54.000000000 +0200 @@ -1,10 +1,10 @@ Index: rar.hpp =================================================================== ---- rar.hpp.orig 2011-01-04 14:28:47.000000000 +0200 -+++ rar.hpp 2011-01-05 01:25:54.667105215 +0200 -@@ -20,6 +20,7 @@ - #include "array.hpp" +--- rar.hpp.orig ++++ rar.hpp +@@ -21,6 +21,7 @@ #include "timefn.hpp" + #include "secpassword.hpp" #include "options.hpp" +#include "global.hpp" #include "headers.hpp" ++++++ unrarsrc-3.9-soname.patch -> unrarsrc-4.2.4-soname.patch ++++++ --- /work/SRC/openSUSE:Factory:NonFree/unrar/unrarsrc-3.9-soname.patch 2011-09-23 15:03:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrarsrc-4.2.4-soname.patch 2012-10-22 22:12:54.000000000 +0200 @@ -1,10 +1,10 @@ Index: makefile.unix =================================================================== ---- makefile.unix.orig 2010-03-30 17:26:26.000000000 +0200 -+++ makefile.unix 2011-01-05 01:27:11.092105262 +0200 -@@ -133,7 +133,7 @@ sfx: $(OBJECTS) - lib: WHAT=RARDLL - lib: $(OBJECTS) $(LIB_OBJ) +--- makefile.unix.orig ++++ makefile.unix +@@ -131,7 +131,7 @@ lib: WHAT=RARDLL + lib: CXXFLAGS+=$(LIBFLAGS) + lib: clean $(OBJECTS) $(LIB_OBJ) @rm -f libunrar.so - $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + $(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
