upgraded to 0.22

diff --git a/wxHexEditor-build.patch b/wxHexEditor-build.patch
deleted file mode 100644 (file)
index 14e012d..0000000
--- a/wxHexEditor-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- wxHexEditor/DataInterpreter.h.org  2009-08-28 01:50:53.000000000 +0200
-+++ wxHexEditor/DataInterpreter.h      2009-08-28 01:51:17.000000000 +0200
-@@ -32,6 +32,8 @@
- #ifndef DATAINTERPRETER_H
- #define DATAINTERPRETER_H
- 
-+#include <stdint.h>
-+
- class DataInterpreter : public InterpreterGui{
-       protected:
-               struct unidata{
---- wxHexEditor/HexEditorCtrl/wxHexCtrl/Tag.h.org      2009-08-28 01:54:32.000000000 +0200
-+++ wxHexEditor/HexEditorCtrl/wxHexCtrl/Tag.h  2009-08-28 01:54:56.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <wx/popupwin.h>
- #include <wx/dcmemory.h>
- #include "TagDialogGui.h"
-+#include <stdint.h>
- 
- class TagElement{
-       public:

diff --git a/wxHexEditor-makefile.patch b/wxHexEditor-makefile.patch
deleted file mode 100644 (file)
index 34bd6c8..0000000
--- a/wxHexEditor-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wxHexEditor/makefile.orig  2009-02-22 03:11:04.000000000 +0100
-+++ wxHexEditor/makefile       2009-08-30 13:17:49.000000000 +0200
-@@ -1,6 +1,6 @@
--WXCONFIG = wx-config
-+WXCONFIG = wx-gtk2-unicode-config
- CPP = `$(WXCONFIG) --cxx`
--CXXFLAGS= `$(WXCONFIG) --cxxflags` -c -O3
-+CXXFLAGS= `$(WXCONFIG) --cxxflags` -c
- LDFLAGS = `$(WXCONFIG) --libs`
- 
- SOURCES= HexEditorGui.cpp FileDifference.cpp HexDialogs.cpp HexEditorApp.cpp HexEditor.cpp HexEditorCtrl/HexEditorCtrl.cpp HexEditorCtrl/wxHexCtrl/TagDialogGui.cpp HexEditorCtrl/wxHexCtrl/wxHexCtrl.cpp HexEditorCtrl/wxHexCtrl/Tag.cpp HexEditorCtrl/HexEditorCtrlGui.cpp HexEditorFrame.cpp

diff --git a/wxHexEditor.spec b/wxHexEditor.spec
index 288a6f1cc11a19aa7e9ecc009a47d7b4014aad4a..aa74afeaf06293323a462aa01690a8c9f569c569 100644 (file)
--- a/wxHexEditor.spec
+++ b/wxHexEditor.spec
@@ -1,47 +1,66 @@
-%define rel alpha
+# TODO: package and switch to system-wide udis86
+#
 Summary:       Hex editor wxHeXEditor
 Summary(pl.UTF-8):     Hex edytor wxHexEditor
 Name:          wxHexEditor
-Version:       0.07
-Release:       0.%{rel}.1
+Version:       0.22
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Editors
 Source0:       http://dl.sourceforge.net/project/wxhexeditor/wxHexEditor/v0.07%20Alpha/%{name}-v%{version}_%{rel}-src.tar.bz2
-# Source0-md5: f93821aa23f72aa28ed0b5869591fc1e
-Patch0:                %{name}-makefile.patch
-Patch1:                %{name}-build.patch
+# Source0-md5: eb88cfcda0553e23a2a9490197e18552
 URL:           http://wxhexeditor.sourceforge.net/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtoolize
+BuildRequires: mhash-devel
 BuildRequires: wxGTK2-unicode-devel >= 2.8
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 wxHexEditor is another Hex Editor, build because of there is no good
 hex editor for Linux system, specially for big files. It supports
-files up to 2^64 bytes.
+files up to 2^64 bytes and devices. Designed for reverse enginering
+binary files.
 
 %description -l pl.UTF-8
-wxHexEditor to kolejny hex editor, stworzony ponieważ nie ma dobrych
-edytorów dla systemu Linux, szczególnie dla dużych plików. Wspiera
-pliki do rozmiaru 2^64 bajtów.
+wxHexEditor to kolejny edytor szesnastkowy, stworzony ponieważ nie ma
+dobrych edytorów dla systemu Linux, szczególnie dla dużych plików.
+Wspiera pliki do rozmiaru 2^64 bajtów i urządzenia blokowe. Został
+dostoswany do reverse engineringu plików binarnych.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
 
 %build
+cd udis86
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
+cd ..
 
 %{__make} \
-       CPP="%{__cxx} %{rpmcxxflags}"
+       WXCONFIG=wx-gtk2-unicode-config \
+       LIBS='udis86/libudis86/.libs/libudis86.a -lmhash' \
+       CXXFLAGS="%{rpmcxxflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc docs/Change.log
 %attr(755,root,root)%{_bindir}/%{name}
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png