[qwtpolar] INITIAL IMPORT
Volker Fröhlich
volter at fedoraproject.org
Sun Jul 17 19:06:09 UTC 2011
commit 888574054682207f344185a496fa6b9eb6dcc06c
Author: Volker Fröhlich <volker27 at gmx.at>
Date: Sun Jul 17 21:05:34 2011 +0200
INITIAL IMPORT
.gitignore | 1 +
qwtpolar-0.1.0-api.patch | 88 ++++++++++++++++++++++++++++++++++++++++
qwtpolar-0.1.0-path.patch | 23 ++++++++++
qwtpolar.spec | 98 +++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 211 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..fc90f5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/qwtpolar-0.1.0.tar.bz2
diff --git a/qwtpolar-0.1.0-api.patch b/qwtpolar-0.1.0-api.patch
new file mode 100644
index 0000000..162f9a4
--- /dev/null
+++ b/qwtpolar-0.1.0-api.patch
@@ -0,0 +1,88 @@
+diff -Nur qwtpolar-0.1.0/src/qwt_polar_grid.cpp qwtpolar-0.1.0-api/src/qwt_polar_grid.cpp
+--- qwtpolar-0.1.0/src/qwt_polar_grid.cpp 2009-05-25 16:01:30.000000000 +0200
++++ qwtpolar-0.1.0-api/src/qwt_polar_grid.cpp 2011-05-21 12:41:31.116029012 +0200
+@@ -767,12 +767,20 @@
+ if ( axis.isVisible &&
+ axis.scaleDraw->hasComponent(QwtAbstractScaleDraw::Backbone) )
+ {
+- if ( isClose(val, gridData.scaleDiv.upperBound()) )
++#if QWT_VERSION < 0x050200
++ if ( isClose( val, gridData.scaleDiv.hBound() ) )
++#else
++ if ( isClose( val, gridData.scaleDiv.upperBound() ) )
++#endif
+ skipLine = true;
+ }
+ }
+
++#if QWT_VERSION < 0x050200
++ if ( isClose( val, gridData.scaleDiv.lBound() ) )
++#else
+ if ( isClose(val, gridData.scaleDiv.lowerBound()) )
++#endif
+ skipLine = true;
+
+ if ( !skipLine )
+@@ -1014,7 +1022,11 @@
+ skipOrigin = true;
+ }
+ }
++#if QWT_VERSION < 0x050200
++ if ( ticks.size() > 0 && ticks.first() == sd.lBound() )
++#else
+ if ( ticks.size() > 0 && ticks.first() == sd.lowerBound() )
++#endif
+ {
+ if ( skipOrigin )
+ {
+@@ -1031,7 +1043,11 @@
+
+ if ( testDisplayFlag(HideMaxRadiusLabel) )
+ {
++#if QWT_VERSION < 0x050200
++ if ( ticks.size() > 0 && ticks.last() == sd.hBound() )
++#else
+ if ( ticks.size() > 0 && ticks.last() == sd.upperBound() )
++#endif
+ #if QT_VERSION < 0x040000
+ ticks.pop_back();
+ #else
+diff -Nur qwtpolar-0.1.0/src/qwt_polar_plot.cpp qwtpolar-0.1.0-api/src/qwt_polar_plot.cpp
+--- qwtpolar-0.1.0/src/qwt_polar_plot.cpp 2009-05-25 16:01:30.000000000 +0200
++++ qwtpolar-0.1.0-api/src/qwt_polar_plot.cpp 2011-05-21 12:44:37.464028939 +0200
+@@ -741,7 +741,11 @@
+ map.setTransformation(scaleEngine(scaleId)->transformation());
+
+ const QwtScaleDiv *sd = scaleDiv(scaleId);
++#if QWT_VERSION < 0x050200
++ map.setScaleInterval( sd->lBound(), sd->hBound() );
++#else
+ map.setScaleInterval(sd->lowerBound(), sd->upperBound());
++#endif
+
+ if ( scaleId == QwtPolar::Azimuth)
+ {
+@@ -1169,7 +1173,11 @@
+ QwtScaleMap map;
+ map.setTransformation(se->transformation());
+ map.setPaintXInterval(0.0, radius / d_data->zoomFactor);
++#if QWT_VERSION < 0x050200
++ map.setScaleInterval( sd->lBound(), sd->hBound() );
++#else
+ map.setScaleInterval(sd->lowerBound(), sd->upperBound());
++#endif
+
+ double v = map.s1();
+ if ( map.s1() <= map.s2() )
+@@ -1202,7 +1210,11 @@
+ const QwtDoubleRect pRect = plotRect(cRect.toRect());
+ if ( cRect.contains(pRect.toRect()) || !cRect.intersects(pRect) )
+ {
++#if QWT_VERSION < 0x050200
++ return QwtDoubleInterval( sd->lBound(), sd->hBound() );
++#else
+ return QwtDoubleInterval(sd->lowerBound(), sd->upperBound());
++#endif
+ }
+
+ const QwtDoublePoint pole = pRect.center();
diff --git a/qwtpolar-0.1.0-path.patch b/qwtpolar-0.1.0-path.patch
new file mode 100644
index 0000000..206092e
--- /dev/null
+++ b/qwtpolar-0.1.0-path.patch
@@ -0,0 +1,23 @@
+--- qwtpolar-0.1.0/qwtpolar.pri 2009-05-25 16:01:30.000000000 +0200
++++ qwtpolar-0.1.0_path/qwtpolar.pri 2011-02-01 19:53:30.785244929 +0100
+@@ -15,17 +15,10 @@
+ VER_PAT = 0
+ VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+
+-unix {
+- INSTALLBASE = /usr/local/qwtpolar-0.1.0
+-}
+-
+-win32 {
+- INSTALLBASE = C:/QwtPolar-0.1.0
+-}
+
+-target.path = $$INSTALLBASE/lib
+-headers.path = $$INSTALLBASE/include
+-doc.path = $$INSTALLBASE/doc
++target.path = LIBPATH
++headers.path = HEADERPATH
++doc.path = DOCPATH
+
+ ######################################################################
+ # qmake internal options
diff --git a/qwtpolar.spec b/qwtpolar.spec
new file mode 100644
index 0000000..befcd4e
--- /dev/null
+++ b/qwtpolar.spec
@@ -0,0 +1,98 @@
+Name: qwtpolar
+Version: 0.1.0
+Release: 5%{?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
+
+# Introduces placeholders in Qmake's .pri file to be substituted later
+Patch0: %{name}-%{version}-path.patch
+Patch1: %{name}-%{version}-api.patch
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: qwt-devel
+BuildRequires: doxygen
+
+%description
+The QwtPolar library contains classes for displaying values on a polar
+coordinate system. It is an add-on package for the Qwt Library.
+
+%package devel
+Summary: Development Libraries for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the files necessary
+to develop applications using QwtPolar.
+
+%prep
+%setup -q
+%patch0 -p1 -b .path
+%patch1 -p1 -b .api
+
+# Make the Makefile verbose, set include- and lib paths, as well as the path for documentation
+sed -i "/silent/d" qwtpolar.pri
+sed -i "s\LIBPATH\ %{_libdir}\1" qwtpolar.pri
+sed -i "s\HEADERPATH\ %{_includedir}/%{name}\1" qwtpolar.pri
+sed -i "s\DOCPATH\ %{_docdir}/%{name}-%{version}\1" qwtpolar.pri
+sed -i "s|/path/to/qwt-5.2/include|%{_includedir}/qwt|" qwtpolar.pri
+sed -i "s|/path/to/qwt-5.2/lib|%{_libdir}|" qwtpolar.pri
+
+# Don't link pthread and rather use -O2 as linker optimization level
+# These two settings come from:
+# /usr/lib64/qt4/mkspecs/common/linux.conf
+# /usr/lib64/qt4/mkspecs/common/g++-multilib.conf
+sed -i "/qt/iQMAKE_LIBS_THREAD -= -lpthread" qwtpolar.pri
+sed -i "/qt/iQMAKE_LFLAGS_RELEASE ~= s\/-O1\/-O2" qwtpolar.pri
+
+chmod 644 COPYING
+
+%build
+qmake-qt4
+#Not parallel build proof
+make
+
+pushd doc
+doxygen Doxyfile
+popd
+
+%install
+make install INSTALL_ROOT=%{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%doc COPYING CHANGES
+%{_libdir}/lib%{name}.so.*
+
+%files devel
+%doc doc/html examples
+%{_includedir}/%{name}
+%{_libdir}/qt4/plugins/designer/libqwt_polar_designer_plugin.so
+%{_libdir}/lib%{name}.so
+
+%changelog
+* Mon Jul 11 2011 Volker Fröhlich <volker27 at gmx.at> 0.1.0-5
+- Don't build with multiple workers
+
+* Thu Jul 07 2011 Volker Fröhlich <volker27 at gmx.at> 0.1.0-4
+- Replace optimization on linker call and remove pthread link
+- Explicit make call
+- Produce proper developer documentation
+- Drop defattr lines
+
+* Sat Jun 06 2011 Volker Fröhlich <volker27 at gmx.at> 0.1.0-3
+- Removed waste word from description
+
+* Sat May 21 2011 Volker Fröhlich <volker27 at gmx.at> 0.1.0-2
+- Use upstream's summary
+
+* Sat May 21 2011 Volker Fröhlich <volker27 at gmx.at> 0.1.0-1
+- Initial packaging for Fedora
diff --git a/sources b/sources
index e69de29..1a4ec07 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+eda110ec4fcf1ee03a507328de864cdc qwtpolar-0.1.0.tar.bz2
More information about the scm-commits
mailing list