[qwtpolar] qwtpolar-1.1.0-rc0
Rex Dieter
rdieter at fedoraproject.org
Tue Oct 29 18:10:40 UTC 2013
commit 5b9edace22e45eec99b71db89295dcd753428a44
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Oct 29 13:10:49 2013 -0500
qwtpolar-1.1.0-rc0
.gitignore | 2 +-
qwtpolar-1.0.1-paths.patch | 57 -------------------------
qwtpolar-1.0.1-qreal.patch | 33 --------------
qwtpolar-1.1.0-rc0-pkgconfig.patch | 19 ++++++++
qwtpolar-1.1.0-rc0-qt_install_paths.patch | 66 +++++++++++++++++++++++++++++
qwtpolar.spec | 32 +++++++++-----
sources | 2 +-
7 files changed, 107 insertions(+), 104 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f24a40f..77e480f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/qwtpolar-0.1.0.tar.bz2
/qwtpolar-1.0.1.tar.bz2
+/qwtpolar-1.1.0-rc0.zip
diff --git a/qwtpolar-1.1.0-rc0-pkgconfig.patch b/qwtpolar-1.1.0-rc0-pkgconfig.patch
new file mode 100644
index 0000000..7da9f15
--- /dev/null
+++ b/qwtpolar-1.1.0-rc0-pkgconfig.patch
@@ -0,0 +1,19 @@
+diff -up qwtpolar-1.1.0-rc0/src/src.pro.pkgconfig qwtpolar-1.1.0-rc0/src/src.pro
+--- qwtpolar-1.1.0-rc0/src/src.pro.pkgconfig 2013-09-01 07:46:36.000000000 -0500
++++ qwtpolar-1.1.0-rc0/src/src.pro 2013-10-29 12:22:50.814008973 -0500
+@@ -16,6 +16,15 @@ include( $${QWT_POLAR_ROOT}/qwtpolarfunc
+ TEMPLATE = lib
+ TARGET = $$qwtPolarLibraryTarget(qwtpolar)
+
++# pkgconfig support
++CONFIG += create_pc create_prl no_install_prl
++QMAKE_PKGCONFIG_NAME = qwtpolar
++QMAKE_PKGCONFIG_DESCRIPTION = Qt/Qwt Polar Plot Widget
++QMAKE_PKGCONFIG_LIBDIR = $${QWT_POLAR_INSTALL_LIBS}
++QMAKE_PKGCONFIG_INCDIR = $${QWT_POLAR_INSTALL_HEADERS}
++QMAKE_PKGCONFIG_REQUIRES = qwt QtCore
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++
+ DESTDIR = $${QWT_POLAR_ROOT}/lib
+
+ contains(QWT_POLAR_CONFIG, QwtPolarDll ) {
diff --git a/qwtpolar-1.1.0-rc0-qt_install_paths.patch b/qwtpolar-1.1.0-rc0-qt_install_paths.patch
new file mode 100644
index 0000000..973d810
--- /dev/null
+++ b/qwtpolar-1.1.0-rc0-qt_install_paths.patch
@@ -0,0 +1,66 @@
+diff -up qwtpolar-1.1.0-rc0/qwtpolarbuild.pri.qt_install_paths qwtpolar-1.1.0-rc0/qwtpolarbuild.pri
+--- qwtpolar-1.1.0-rc0/qwtpolarbuild.pri.qt_install_paths 2013-09-01 07:46:36.000000000 -0500
++++ qwtpolar-1.1.0-rc0/qwtpolarbuild.pri 2013-10-29 12:18:07.350178228 -0500
+@@ -13,7 +13,7 @@
+ CONFIG += qt
+ CONFIG += warn_on
+ CONFIG += no_keywords
+-CONFIG += silent
++#CONFIG += silent
+
+ CONFIG += qwt
+
+diff -up qwtpolar-1.1.0-rc0/qwtpolarconfig.pri.qt_install_paths qwtpolar-1.1.0-rc0/qwtpolarconfig.pri
+--- qwtpolar-1.1.0-rc0/qwtpolarconfig.pri.qt_install_paths 2013-09-01 07:46:36.000000000 -0500
++++ qwtpolar-1.1.0-rc0/qwtpolarconfig.pri 2013-10-29 12:17:47.770535301 -0500
+@@ -15,24 +15,16 @@ QWT_POLAR_VER_MIN = 1
+ QWT_POLAR_VER_PAT = 0
+ QWT_POLAR_VERSION = $${QWT_POLAR_VER_MAJ}.$${QWT_POLAR_VER_MIN}.$${QWT_POLAR_VER_PAT}
+
+-unix {
+- QWT_POLAR_INSTALL_PREFIX = /usr/local/qwtpolar-$$QWT_POLAR_VERSION-rc0
+-}
+-
+-win32 {
+- QWT_POLAR_INSTALL_PREFIX = C:/QwtPolar-$$QWT_POLAR_VERSION-rc0
+-}
+-
+-QWT_POLAR_INSTALL_DOCS = $${QWT_POLAR_INSTALL_PREFIX}/doc
+-QWT_POLAR_INSTALL_HEADERS = $${QWT_POLAR_INSTALL_PREFIX}/include
+-QWT_POLAR_INSTALL_LIBS = $${QWT_POLAR_INSTALL_PREFIX}/lib
+-
++QWT_POLAR_INSTALL_DOCS = $$[QT_INSTALL_DOCS]/html
++QWT_POLAR_INSTALL_HEADERS = $$[QT_INSTALL_HEADERS]
++QWT_POLAR_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
++
+ ######################################################################
+ # Designer plugin
+ ######################################################################
+
+-QWT_POLAR_INSTALL_PLUGINS = $${QWT_POLAR_INSTALL_PREFIX}/plugins/designer
+-# QWT_POLAR_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer
++#QWT_POLAR_INSTALL_PLUGINS = $${QWT_POLAR_INSTALL_PREFIX}/plugins/designer
++QWT_POLAR_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
+
+ ######################################################################
+ # Build the static/shared libraries.
+@@ -61,8 +53,8 @@ QWT_POLAR_CONFIG += QwtPolarSvg
+ # with every Qt upgrade.
+ ######################################################################
+
+-QWT_POLAR_INSTALL_FEATURES = $${QWT_POLAR_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features
++#QWT_POLAR_INSTALL_FEATURES = $${QWT_POLAR_INSTALL_PREFIX}/features
++QWT_POLAR_INSTALL_FEATURES = $$[QMAKE_MKSPECS]/features
+
+ ######################################################################
+ # If you want to build the QwtPolar designer plugin,
+@@ -77,7 +69,7 @@ QWT_POLAR_CONFIG += QwtPolarDesigner
+ # Otherwise you have to build them from the examples directory.
+ ######################################################################
+
+-QWT_POLAR_CONFIG += QwtPolarExamples
++#QWT_POLAR_CONFIG += QwtPolarExamples
+
+ ######################################################################
+ # When Qt has been built as framework qmake wants
diff --git a/qwtpolar.spec b/qwtpolar.spec
index 256c708..17bd496 100644
--- a/qwtpolar.spec
+++ b/qwtpolar.spec
@@ -1,15 +1,19 @@
+
+%define pre rc0
+
Name: qwtpolar
-Version: 1.0.1
-Release: 3%{?dist}
+Version: 1.1.0
+Release: 0.1.%{pre}%{?dist}
Summary: Qwt/Qt Polar Plot Library
Group: System Environment/Libraries
License: LGPLv2 with exceptions
URL: http://qwtpolar.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?pre:-%{pre}}.zip
-Patch0: %{name}-1.0.1-paths.patch
-# fix qreal != double assumptions (for arm)
-Patch1: qwtpolar-1.0.1-qreal.patch
+# use system qt_install paths
+Patch0: qwtpolar-1.1.0-rc0-qt_install_paths.patch
+# add pkgconfig support
+Patch1: qwtpolar-1.1.0-rc0-pkgconfig.patch
BuildRequires: qwt-devel
%description
@@ -34,16 +38,16 @@ This package contains developer documentation for QwtPolar.
%prep
-%setup -q
-%patch0 -p1 -b .paths
-%patch1 -p1 -b .qreal
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
+%patch0 -p1 -b .qt_install_paths
+%patch1 -p1 -b .pkgconfig
rm -rf doc/man
chmod 644 COPYING
%build
-%{?_qt4_qmake} CONFIG+=install-qt
+%{?_qt4_qmake}
make %{?_smp_mflags}
@@ -61,12 +65,13 @@ mv %{buildroot}/%{_qt4_docdir}/html/html \
%files
%doc COPYING CHANGES
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/libqwtpolar.so.1*
%{?_qt4_plugindir}/designer/libqwt_polar_designer_plugin.so
%files devel
%{_includedir}/qwt_polar*.h
-%{_libdir}/lib%{name}.so
+%{_libdir}/libqwtpolar.so
+%{_libdir}/pkgconfig/qwtpolar.pc
%{_qt4_libdir}/qt4/mkspecs/features/%{name}*
%files doc
@@ -78,6 +83,9 @@ mv %{buildroot}/%{_qt4_docdir}/html/html \
%changelog
+* Tue Oct 29 2013 Rex Dieter <rdieter at fedoraproject.org> 1.1.0-0.1.rc0
+- qwtpolar-1.1.0-rc0
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index c3ead77..6eb2125 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-928e3d8781274c98d41d8b118b7a6508 qwtpolar-1.0.1.tar.bz2
+f51064d06ab72ce0f233fc88a21fbfcb qwtpolar-1.1.0-rc0.zip
More information about the scm-commits
mailing list