diff --git a/.gitignore b/.gitignore index d38adcf..526bd1d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -qwt-5.2.1.tar.bz2 +/qwt-5.2.1.tar.bz2 +/qwt-5.2.2.tar.bz2 diff --git a/qwt-5.2.1-install_qt.patch b/qwt-5.2.2-install_qt.patch similarity index 65% rename from qwt-5.2.1-install_qt.patch rename to qwt-5.2.2-install_qt.patch index 994d3b7..8a6b4cb 100644 --- a/qwt-5.2.1-install_qt.patch +++ b/qwt-5.2.2-install_qt.patch @@ -1,8 +1,8 @@ -diff -up qwt-5.2.1/qwtconfig.pri.install_qt qwt-5.2.1/qwtconfig.pri ---- qwt-5.2.1/qwtconfig.pri.install_qt 2010-04-11 04:55:06.000000000 -0500 -+++ qwt-5.2.1/qwtconfig.pri 2011-07-14 08:22:26.207212795 -0500 -@@ -7,6 +7,11 @@ VER_MIN = 2 - VER_PAT = 1 +diff -up qwt-5.2.2/qwtconfig.pri.install_qt qwt-5.2.2/qwtconfig.pri +--- qwt-5.2.2/qwtconfig.pri.install_qt 2011-08-01 04:28:22.000000000 -0500 ++++ qwt-5.2.2/qwtconfig.pri 2011-08-07 00:09:18.834387446 -0500 +@@ -7,10 +7,14 @@ VER_MIN = 2 + VER_PAT = 2 VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +CONFIG(install-qt) { @@ -11,9 +11,13 @@ diff -up qwt-5.2.1/qwtconfig.pri.install_qt qwt-5.2.1/qwtconfig.pri +doc.path = $$[QT_INSTALL_DOCS] +} else { unix { - INSTALLBASE = /usr/local/qwt-5.2.1 + INSTALLBASE = /usr/local/qwt-$$VERSION } -@@ -18,6 +23,7 @@ win32 { +- + win32 { + INSTALLBASE = C:/Qwt-$$VERSION + } +@@ -18,6 +22,7 @@ win32 { target.path = $$INSTALLBASE/lib headers.path = $$INSTALLBASE/include doc.path = $$INSTALLBASE/doc @@ -21,9 +25,9 @@ diff -up qwt-5.2.1/qwtconfig.pri.install_qt qwt-5.2.1/qwtconfig.pri ###################################################################### # qmake internal options -diff -up qwt-5.2.1/src/src.pro.install_qt qwt-5.2.1/src/src.pro ---- qwt-5.2.1/src/src.pro.install_qt 2010-04-11 04:55:06.000000000 -0500 -+++ qwt-5.2.1/src/src.pro 2011-07-14 08:30:39.759190828 -0500 +diff -up qwt-5.2.2/src/src.pro.install_qt qwt-5.2.2/src/src.pro +--- qwt-5.2.2/src/src.pro.install_qt 2011-08-01 04:28:22.000000000 -0500 ++++ qwt-5.2.2/src/src.pro 2011-08-07 00:07:04.920061606 -0500 @@ -220,9 +220,17 @@ contains(CONFIG, QwtWidgets) { # Install directives diff --git a/qwt.spec b/qwt.spec index bcb530d..e7db87f 100644 --- a/qwt.spec +++ b/qwt.spec @@ -1,8 +1,8 @@ Name: qwt Summary: Qt Widgets for Technical Applications -Version: 5.2.1 -Release: 3%{?dist} +Version: 5.2.2 +Release: 1%{?dist} License: LGPLv2 with exceptions URL: http://qwt.sourceforge.net @@ -13,7 +13,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstreamable patches # add install-qt config to use system paths # needs work to fix the doc install for non install-qt case -Patch50: qwt-5.2.1-install_qt.patch +Patch50: qwt-5.2.2-install_qt.patch BuildRequires: qt4-devel @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 07 2011 Rex Dieter 5.2.2-1 +- 5.2.2 + * Thu Jul 14 2011 Rex Dieter 5.2.1-3 - .spec cosmetics - use %%_qt4_ macros diff --git a/sources b/sources index 63aacbd..ee8e891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a595b8db0ec3856b117836c1d60cb27 qwt-5.2.1.tar.bz2 +70d77e4008a6cc86763737f0f24726ca qwt-5.2.2.tar.bz2