Hello community, here is the log from the commit of package usbprog for openSUSE:Factory checked in at 2016-12-02 16:41:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbprog (Old) and /work/SRC/openSUSE:Factory/.usbprog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usbprog" Changes: -------- --- /work/SRC/openSUSE:Factory/usbprog/usbprog.changes 2016-11-04 21:00:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.usbprog.new/usbprog.changes 2016-12-02 16:41:31.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 4 20:22:07 UTC 2016 - [email protected] + +- Replace usbprog-wxwidgets-2.4.diff~ and + ubsprog-wxwidgets-3.0.patch by + usbprog-wxwidgets-3.0.diff and enable STL mode + +------------------------------------------------------------------- Old: ---- ubsprog-wxwidgets-3.0.patch usbprog-wxwidgets-2.4.diff New: ---- usbprog-wxwidgets-3.0.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbprog.spec ++++++ --- /var/tmp/diff_new_pack.pfiOzn/_old 2016-12-02 16:41:32.000000000 +0100 +++ /var/tmp/diff_new_pack.pfiOzn/_new 2016-12-02 16:41:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package usbprog # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -48,23 +48,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Source1: README.distribution -Patch0: usbprog-wxwidgets-2.4.diff -Patch1: ubsprog-wxwidgets-3.0.patch +Patch1: usbprog-wxwidgets-3.0.diff Summary: Programmer for the USBprog hardware License: GPL-2.0+ and CC-BY-SA-3.0 Group: Development/Tools/Other BuildRequires: gcc-c++ +BuildRequires: readline-devel BuildRequires: pkgconfig(libusb) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: readline-devel BuildRequires: pkgconfig(udev) %if %{build_gui} BuildRequires: python-wxWidgets-3_0 -BuildRequires: wxWidgets-3_0-nostl-devel +BuildRequires: wxWidgets-3_0-devel %endif -BuildRequires: pkgconfig(libcurl) BuildRequires: pkg-config +BuildRequires: pkgconfig(libcurl) %define _udevdir %(pkg-config --variable=udevdir udev) %define _udevrulesdir %{_udevdir}/rules.d @@ -72,10 +71,6 @@ %description USBprog is a programmer for the USBprog hardware. -Author ------- - Bernhard Walle <[email protected]> - %if %{build_gui} %package gui @@ -86,10 +81,6 @@ %description gui A wxGTK version of the USBprog programmer. -Author ------- - Bernhard Walle <[email protected]> - %endif %package -n libusbprog0 @@ -100,11 +91,6 @@ %description -n libusbprog0 Library for USBprog. -Author ------- - Bernhard Walle <[email protected]> - - %package devel Requires: %{name} = %{version} Summary: Development files for libusbprog @@ -113,14 +99,8 @@ %description devel Header files for libusbprog. -Author ------- - Bernhard Walle <[email protected]> - - %prep %setup -q -%patch0 -p1 %patch1 -p1 %build @@ -139,9 +119,6 @@ > %{buildroot}%{_udevrulesdir}/98-usbprog.rules sed -e 's/@@USBPROG_GROUP@@/'%{group_name}'/g' %{S:1} > %{readme_name} -%clean -rm -rf "$RPM_BUILD_ROOT" - %post -n libusbprog0 -p /sbin/ldconfig %postun -n libusbprog0 -p /sbin/ldconfig ++++++ usbprog-wxwidgets-2.4.diff -> usbprog-wxwidgets-3.0.diff ++++++ --- /work/SRC/openSUSE:Factory/usbprog/usbprog-wxwidgets-2.4.diff 2011-09-23 12:49:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.usbprog.new/usbprog-wxwidgets-3.0.diff 2016-12-02 16:41:31.000000000 +0100 @@ -1,15 +1,42 @@ --- - gui/viewer_posix.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + gui/usbprogFrm.cc | 4 ++-- + gui/viewer_posix.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) ---- a/gui/viewer_posix.cc -+++ b/gui/viewer_posix.cc -@@ -39,7 +39,7 @@ bool Viewer::openPDF(const wxString &fil +Index: usbprog-0.2.0/gui/usbprogFrm.cc +=================================================================== +--- usbprog-0.2.0.orig/gui/usbprogFrm.cc ++++ usbprog-0.2.0/gui/usbprogFrm.cc +@@ -296,7 +296,7 @@ void usbprogFrm::CreateGUIControls() + + // file dialog + m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"), +- wxT(""), wxT(""), wxT("*.bin"), wxOPEN); ++ wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN); + + m_topBox->Add(topSizer, wxEXPAND, wxALL, 10); + +@@ -670,7 +670,7 @@ void usbprogFrm::enableDisableDebug(wxCo + dbg->setFileHandle(NULL); + } else { + wxFileDialog fdg(m_panel, wxT("Choose a file"), +- wxT(""), wxT(""), wxT("*.log"), wxSAVE); ++ wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE); + if (fdg.ShowModal() != wxID_OK) + dbg->setFileHandle(stderr); + else { +Index: usbprog-0.2.0/gui/viewer_posix.cc +=================================================================== +--- usbprog-0.2.0.orig/gui/viewer_posix.cc ++++ usbprog-0.2.0/gui/viewer_posix.cc +@@ -39,8 +39,8 @@ bool Viewer::openPDF(const wxString &fil } const wxChar *args[] = { - wxString::FromUTF8(VIEWER_COMMAND), +- file, + wxT(VIEWER_COMMAND), - file, ++ file.wc_str(), NULL }; +
