diff --git a/.gitignore b/.gitignore index c1f6f52..9ad7544 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qhexedit2-0.6.3-r41.tar.bz2 +/v0.6.5.tar.gz diff --git a/qhexedit2.spec b/qhexedit2.spec index 8f5452b..0e6e727 100644 --- a/qhexedit2.spec +++ b/qhexedit2.spec @@ -1,17 +1,11 @@ -%global rev 41 - Name: qhexedit2 -Version: 0.6.3 -Release: 3.20141212svnr%{rev}%{?dist} +Version: 0.6.5 +Release: 1%{?dist} Summary: Binary Editor for Qt License: LGPLv2 -URL: https://code.google.com/p/qhexedit2/ -# svn co http://qhexedit2.googlecode.com/svn/trunk/ qhexedit2-$version -# rev=$(svnversion qhexedit2-$version) -# rm -rf qhexedit2-$version/.svn -# tar -cjvf qhexedit2-$version-r$rev.tar.bz2 qhexedit2-$version -Source0: qhexedit2-%{version}-r%{rev}.tar.bz2 +URL: https://github.com/Simsys/qhexedit2 +Source0: https://github.com/Simsys/%{name}/archive/v%{version}.tar.gz Source1: qhexedit.desktop # Fix build issues @@ -103,7 +97,7 @@ rm -f doc/html/installdox # Build library mkdir build-lib pushd build-lib -LDFLAGS="-Wl,--as-needed" %qmake_qt4 ../sip/qhexedit.pro +LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %qmake_qt4 ../sip/qhexedit.pro make %{?_smp_mflags} popd @@ -186,7 +180,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} %{_libdir}/pkgconfig/%{name}.pc %files doc -%doc src/license.txt +%license src/license.txt %doc doc/html %files -n python-%{name} @@ -202,6 +196,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} %{_datadir}/python3-sip/qhexedit/ %changelog +* Thu Apr 16 2015 Sandro Mani - 0.6.5-1 +- Update to 0.6.5 + * Tue Dec 16 2014 Sandro Mani - 0.6.3-3.20141212svnr41 - Fix incorrect Requires diff --git a/qhexedit2_build.patch b/qhexedit2_build.patch index 1706191..ff8b185 100644 --- a/qhexedit2_build.patch +++ b/qhexedit2_build.patch @@ -1,7 +1,7 @@ -diff -rupN qhexedit2-0.6.3/example/qhexedit.pro qhexedit2-0.6.3-new/example/qhexedit.pro ---- qhexedit2-0.6.3/example/qhexedit.pro 2014-08-10 01:30:48.000000000 +0200 -+++ qhexedit2-0.6.3-new/example/qhexedit.pro 2014-08-10 02:12:29.957434726 +0200 -@@ -1,10 +1,6 @@ +diff -rupN qhexedit2-0.6.5/example/qhexedit.pro qhexedit2-0.6.5-new/example/qhexedit.pro +--- qhexedit2-0.6.5/example/qhexedit.pro 2015-04-16 22:16:26.000000000 +0200 ++++ qhexedit2-0.6.5-new/example/qhexedit.pro 2015-04-16 23:20:57.621822247 +0200 +@@ -3,10 +3,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += HEADERS = \ mainwindow.h \ optionsdialog.h \ @@ -12,7 +12,7 @@ diff -rupN qhexedit2-0.6.3/example/qhexedit.pro qhexedit2-0.6.3-new/example/qhex searchdialog.h -@@ -12,12 +8,10 @@ SOURCES = \ +@@ -14,12 +10,10 @@ SOURCES = \ main.cpp \ mainwindow.cpp \ optionsdialog.cpp \ @@ -27,11 +27,9 @@ diff -rupN qhexedit2-0.6.3/example/qhexedit.pro qhexedit2-0.6.3-new/example/qhex RESOURCES = \ qhexedit.qrc -Binary files qhexedit2-0.6.3/example/translations/qhexedit_cs.qm and qhexedit2-0.6.3-new/example/translations/qhexedit_cs.qm differ -Binary files qhexedit2-0.6.3/example/translations/qhexedit_de.qm and qhexedit2-0.6.3-new/example/translations/qhexedit_de.qm differ -diff -rupN qhexedit2-0.6.3/sip/configure.py qhexedit2-0.6.3-new/sip/configure.py ---- qhexedit2-0.6.3/sip/configure.py 2014-08-10 01:30:48.000000000 +0200 -+++ qhexedit2-0.6.3-new/sip/configure.py 2014-08-10 01:33:40.441538242 +0200 +diff -rupN qhexedit2-0.6.5/sip/configure.py qhexedit2-0.6.5-new/sip/configure.py +--- qhexedit2-0.6.5/sip/configure.py 2015-04-16 22:16:26.000000000 +0200 ++++ qhexedit2-0.6.5-new/sip/configure.py 2015-04-16 23:20:57.622822266 +0200 @@ -38,7 +38,7 @@ makefile = pyqtconfig.QtGuiModuleMakefil # Add the library we are wrapping. The name doesn't include any platform # specific prefixes or extensions (e.g. the "lib" prefix on UNIX, or the @@ -41,10 +39,10 @@ diff -rupN qhexedit2-0.6.3/sip/configure.py qhexedit2-0.6.3-new/sip/configure.py makefile.extra_libs = ["qhexedit"] # Generate the Makefile itself. -diff -rupN qhexedit2-0.6.3/sip/qhexedit.pro qhexedit2-0.6.3-new/sip/qhexedit.pro ---- qhexedit2-0.6.3/sip/qhexedit.pro 2014-08-10 01:30:48.000000000 +0200 -+++ qhexedit2-0.6.3-new/sip/qhexedit.pro 2014-08-10 01:31:43.468543439 +0200 -@@ -19,5 +19,3 @@ SOURCES = \ +diff -rupN qhexedit2-0.6.5/sip/qhexedit.pro qhexedit2-0.6.5-new/sip/qhexedit.pro +--- qhexedit2-0.6.5/sip/qhexedit.pro 2015-04-16 22:16:26.000000000 +0200 ++++ qhexedit2-0.6.5-new/sip/qhexedit.pro 2015-04-16 23:20:57.623822285 +0200 +@@ -21,5 +21,3 @@ SOURCES = \ TARGET = qhexedit diff --git a/sources b/sources index 89f73c7..8283c5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e1f1bd66bcde78e3333e70300d10dde qhexedit2-0.6.3-r41.tar.bz2 +dfd2d82b74885e65dd8b2eab56ecd92d v0.6.5.tar.gz