Hello community, here is the log from the commit of package wxhexeditor for openSUSE:Factory checked in at 2014-07-27 18:47:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxhexeditor (Old) and /work/SRC/openSUSE:Factory/.wxhexeditor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxhexeditor" Changes: -------- --- /work/SRC/openSUSE:Factory/wxhexeditor/wxhexeditor.changes 2014-07-24 01:23:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxhexeditor.new/wxhexeditor.changes 2014-07-27 18:47:55.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jul 26 14:06:06 UTC 2014 - [email protected] + +- Add wxhexeditor-0.22-mhash.patch: use system mhash library. +- BuildRequires: mhash-devel. +- Use wxWidgets defines. +- BuildRequires: wxWidgets-wxcontainer-devel -> wxWidgets-devel. +- Remove unused BuildRequires: fdupes. +- Install docs. + +------------------------------------------------------------------- New: ---- wxhexeditor-0.22-mhash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxhexeditor.spec ++++++ --- /var/tmp/diff_new_pack.m3FS1Q/_old 2014-07-27 18:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.m3FS1Q/_new 2014-07-27 18:47:56.000000000 +0200 @@ -15,6 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%define _use_internal_dependency_generator 0 +%define __find_requires %wx_requires + Name: wxhexeditor %define _name wxHexEditor Version: 0.22 @@ -24,15 +28,16 @@ Group: Development/Tools/Other Url: http://wxhexeditor.org/ Source: %{name}-%{version}.tar.bz2 - -BuildRequires: gcc-c++ -BuildRequires: automake +# PATCH-FIX-OPENSUSE wxhexeditor-0.22-mhash.patch [email protected] -- use system mhash library +Patch0: wxhexeditor-0.22-mhash.patch BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ BuildRequires: libtool -BuildRequires: wxWidgets-wxcontainer-devel -BuildRequires: fdupes +BuildRequires: mhash-devel BuildRequires: update-desktop-files -Recommends: %{name}-lang = %{version} +BuildRequires: wxWidgets-devel +Recommends: %{name}-lang %description wxHexEditor is an another Hex Editor, created because of there was no @@ -51,6 +56,8 @@ %prep %setup -q +%patch0 -p1 +chmod -x docs/* %build make %{?_smp_mflags} OPTFLAGS="-fopenmp" @@ -61,6 +68,7 @@ %files %defattr(-,root,root) +%doc docs/{Change.log,GPL.txt} %{_bindir}/%{_name} %{_datadir}/applications/%{_name}.desktop %{_datadir}/pixmaps/%{_name}.png ++++++ wxhexeditor-0.22-mhash.patch ++++++ Index: wxHexEditor/Makefile =================================================================== --- wxHexEditor.orig/Makefile +++ wxHexEditor/Makefile @@ -3,7 +3,7 @@ CC = `$(WXCONFIG) --cc` CXX = `$(WXCONFIG) --cxx` CFLAGS = -O2 CXXFLAGS = -O2 -WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS} +WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -O2 -c ${OPTFLAGS} WXLDFLAGS = `$(WXCONFIG) --libs` RC = `$(WXCONFIG) --rescomp` #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 @@ -23,7 +23,7 @@ SOURCES= src/HexEditorGui.cpp \ src/HexEditorCtrl/wxHexCtrl/Tag.cpp\ src/HexEditorCtrl/HexEditorCtrlGui.cpp\ src/HexEditorFrame.cpp -LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a +LIBS = udis86/libudis86/.libs/libudis86.a OBJECTS=$(SOURCES:.cpp=.o) DEPENDS=$(OBJECTS:.o=.d) LANGUAGEDIRS=tr ru @@ -48,7 +48,7 @@ $(OBJECTS): $(LIBS) $(SOURCES) MOBJECTS=$(LANGUAGES:.po=.mo) $(EXECUTABLE): $(OBJECTS) - $(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -o $@ + $(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -lmhash -o $@ .cpp.o: $(LIBS) $(CXX) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@ @@ -66,10 +66,6 @@ udis86/libudis86/.libs/libudis86.a: cd udis86;./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" cd udis86/libudis86; $(MAKE) $(MFLAGS) -mhash/lib/.libs/libmhash.a: - cd mhash; ./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" - cd mhash; $(MAKE) $(MFLAGS) - win: $(RESOURCES) $(EXECUTABLE_WIN) #Stack override required for file comparison function... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
