[qwt5] import
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 19 14:42:27 UTC 2012
commit 66b3437834d314deb3d0e322adb92a4034823907
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Oct 19 09:42:22 2012 -0500
import
.gitignore | 1 +
qwt-5.2.2-install_qt.patch | 117 ++++++++++++++++++++++++++++
qwt5.spec | 182 ++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 301 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..810fdf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/qwt-5.2.2.tar.bz2
diff --git a/qwt-5.2.2-install_qt.patch b/qwt-5.2.2-install_qt.patch
new file mode 100644
index 0000000..1c5f83d
--- /dev/null
+++ b/qwt-5.2.2-install_qt.patch
@@ -0,0 +1,117 @@
+diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro
+--- qwt-5.2.2/designer/designer.pro.install_qt 2011-08-01 04:28:22.000000000 -0500
++++ qwt-5.2.2/designer/designer.pro 2012-08-14 11:11:22.569229749 -0500
+@@ -27,6 +27,7 @@ contains(CONFIG, QwtDesigner) {
+ else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+ }
++ LIBNAME = qwt-qt3$${SUFFIX_STR}
+ }
+ else {
+
+@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) {
+ else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+ }
++ LIBNAME = qwt$${SUFFIX_STR}
+ }
+
+ TEMPLATE = lib
+@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) {
+ INCLUDEPATH += $${QWT_ROOT}/src
+ DEPENDPATH += $${QWT_ROOT}/src
+
+- LIBNAME = qwt$${SUFFIX_STR}
+ contains(CONFIG, QwtDll) {
+ win32 {
+ DEFINES += QT_DLL QWT_DLL
+@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) {
+
+ # Qt 4
+
+- TARGET = qwt_designer_plugin$${SUFFIX_STR}
++ TARGET = qwt5_designer_plugin$${SUFFIX_STR}
+ CONFIG += qt designer plugin
+
+ RCC_DIR = resources
+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 2012-08-14 11:11:22.569229749 -0500
+@@ -7,6 +7,16 @@ VER_MIN = 2
+ VER_PAT = 2
+ VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+
++CONFIG(install-qt) {
++target.path = $$[QT_INSTALL_LIBS]
++doc.path = $$[QT_INSTALL_DOCS]
++VVERSION = $$[QT_VERSION]
++isEmpty(VVERSION) {
++headers.path = $$[QT_INSTALL_HEADERS]/qwt5-qt3
++} else {
++headers.path = $$[QT_INSTALL_HEADERS]/qwt5-qt4
++}
++} else {
+ unix {
+ INSTALLBASE = /usr/local/qwt-$$VERSION
+ }
+@@ -18,6 +28,7 @@ win32 {
+ target.path = $$INSTALLBASE/lib
+ headers.path = $$INSTALLBASE/include
+ doc.path = $$INSTALLBASE/doc
++}
+
+ ######################################################################
+ # qmake internal options
+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 2012-08-14 11:11:41.635991383 -0500
+@@ -24,6 +24,7 @@ isEmpty(VVERSION) {
+ else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+ }
++ TARGET = qwt-qt3$${SUFFIX_STR}
+ }
+ else {
+ CONFIG(debug, debug|release) {
+@@ -32,9 +33,17 @@ else {
+ else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+ }
++ TARGET = qwt$${SUFFIX_STR}
++ # pkgconfig support
++ CONFIG += create_pc create_prl no_install_prl
++ QMAKE_PKGCONFIG_NAME = qwt5-qt4$${SUFFIX_STR}
++ QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications
++ QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/qwt5-qt4
++ QMAKE_PKGCONFIG_REQUIRES = QtGui QtSvg
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ }
+
+-TARGET = qwt$${SUFFIX_STR}
+ TEMPLATE = lib
+
+ MOC_DIR = moc
+@@ -220,9 +229,17 @@ contains(CONFIG, QwtWidgets) {
+ # Install directives
+
+ headers.files = $$HEADERS
+-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+-unix {
+- doc.files += $${QWT_ROOT}/doc/man
+-}
++INSTALLS += target headers
++
++html.files = $${QWT_ROOT}/doc/html
++html.path = $$[QT_INSTALL_DOCS]/html/
++INSTALLS += html
++
++qch.files = $${QWT_ROOT}/doc/qwt-5.2.0.qch
++qch.path = $$[QT_INSTALL_DOCS]/qch
++INSTALLS += qch
++
++unix:man.files += $${QWT_ROOT}/doc/man
++unix:man.path = /usr/share
++unix:INSTALLS += man
+
+-INSTALLS = target headers doc
diff --git a/qwt5.spec b/qwt5.spec
new file mode 100644
index 0000000..376ce10
--- /dev/null
+++ b/qwt5.spec
@@ -0,0 +1,182 @@
+
+Name: qwt5
+Summary: Qt Widgets for Technical Applications
+Version: 5.2.2
+Release: 21%{?dist}
+
+License: LGPLv2 with exceptions
+URL: http://qwt.sourceforge.net/
+Source: http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
+
+## 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.2-install_qt.patch
+
+BuildRequires: pkgconfig(QtGui) pkgconfig(QtSvg)
+
+%description
+The Qwt library contains GUI Components and utility classes which are primarily
+useful for programs with a technical background.
+Besides a 2D plot widget it provides scales, sliders, dials, compasses,
+thermometers, wheels and knobs to control or display values, arrays
+or ranges of type double.
+
+%package qt4
+Obsoletes: qwt < 5.2.2-20
+Summary: Qt Widgets for Technical Applications
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%description qt4
+The Qwt library contains GUI Components and utility classes which are primarily
+useful for programs with a technical background.
+Besides a 2D plot widget it provides scales, sliders, dials, compasses,
+thermometers, wheels and knobs to control or display values, arrays
+or ranges of type double.
+
+%package qt4-devel
+Summary: Development files for %{name}
+Obsoletes: qwt-devel < 5.2.2-20
+Requires: %{name}-qt4%{?_isa} = %{version}-%{release}
+%description qt4-devel
+%{summary}.
+
+%package doc
+Summary: Extra Developer documentation for %{name}
+Obsoletes: qwt-doc < 5.2.2-20
+BuildArch: noarch
+%description doc
+%{summary}.
+
+
+
+%prep
+%setup -q -n qwt-%{version}
+
+%patch50 -p1 -b .install_qt
+
+
+%build
+%{?_qt4_qmake} \
+ CONFIG+=QwtSVGItem \
+ CONFIG+=install-qt
+
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install INSTALL_ROOT=%{buildroot}
+
+# hacks for parallel-installability with qwt(6)
+mv %{buildroot}%{_qt4_libdir}/libqwt.so \
+ %{buildroot}%{_qt4_libdir}/libqwt5-qt4.so
+mv %{buildroot}%{_qt4_libdir}/pkgconfig/qwt.pc \
+ %{buildroot}%{_qt4_libdir}/pkgconfig/qwt5-qt4.pc
+sed -i -e 's|-lqwt|-lqwt5-qt4|g' %{buildroot}%{_qt4_libdir}/pkgconfig/qwt5-qt4.pc
+
+# fixup docs bogosity
+mv %{buildroot}%{_qt4_docdir}/html/html \
+ %{buildroot}%{_qt4_docdir}/html/qwt5
+
+
+%post qt4 -p /sbin/ldconfig
+%postun qt4 -p /sbin/ldconfig
+
+%files qt4
+%defattr(-,root,root,-)
+%doc CHANGES
+%doc COPYING
+%doc README
+%{_qt4_libdir}/libqwt.so.5*
+%{?_qt4_plugindir}/designer/libqwt5_designer_plugin.so
+
+%files qt4-devel
+%defattr(-,root,root,-)
+%{_mandir}/man3/*
+%{_qt4_headerdir}/qwt5-qt4/
+%{_qt4_libdir}/libqwt5-qt4.so
+%{_qt4_libdir}/pkgconfig/qwt5-qt4.pc
+
+%files doc
+%defattr(-,root,root,-)
+# own these to avoid needless dep on qt/qt-doc
+%dir %{_qt4_docdir}
+%dir %{_qt4_docdir}/html/
+%{_qt4_docdir}/html/qwt5/
+
+
+%changelog
+* Tue Aug 14 2012 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-21
+- don't change soname, just libqwt.so symlink
+
+* Fri Aug 03 2012 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-20
+- pkgconfig support
+- bump release to -20
+
+* Tue Jul 31 2012 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-5
+- make parallel-installable with qwt6
+
+* Tue Jul 31 2012 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-4
+- Provides: qwt5-qt4(-devel)
+- pkgconfig-style deps
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun Aug 07 2011 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-1
+- 5.2.2
+
+* Thu Jul 14 2011 Rex Dieter <rdieter at fedoraproject.org> 5.2.1-3
+- .spec cosmetics
+- use %%_qt4_ macros
+- -doc subpkg here (instead of separately built)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Apr 16 2010 Frank Büttner <frank-buettner at gmx.net> - 5.2.1-1
+- update to 5.2.1
+
+* Fri Feb 05 2010 Frank Büttner <frank-buettner at gmx.net> - 5.2.0-1
+- fix wrong lib names
+
+* Fri Feb 05 2010 Frank Büttner <frank-buettner at gmx.net> - 5.2.0-0
+- update to 5.2.0
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 04 2009 Frank Büttner <frank-buettner at gmx.net> - 5.1.1-2
+ - modify path patch
+
+* Sun Jan 04 2009 Frank Büttner <frank-buettner at gmx.net> - 5.1.1-1
+ -update to 5.1.1
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0.2-6
+- Autorebuild for GCC 4.3
+
+* Sat Sep 29 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-5
+ - add EPEL support
+
+* Sat Sep 29 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-4
+- remove parallel build, because it will fail sometimes
+
+* Fri Sep 28 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-3
+- fix some errors in the spec file
+
+* Fri Jul 06 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-2
+- fix some errors in the spec file
+
+* Mon Jun 11 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-1
+- update to 5.0.2
+- split doc
+
+* Thu May 15 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.1-1
+ - start
+
diff --git a/sources b/sources
index e69de29..ee8e891 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+70d77e4008a6cc86763737f0f24726ca qwt-5.2.2.tar.bz2
More information about the scm-commits
mailing list