[herqq] initial import
Jaroslav Reznik
jreznik at fedoraproject.org
Wed Jul 20 14:16:06 UTC 2011
commit dd500356e1bf753d0bcd8025f4f638ca149b4a9b
Author: Jaroslav Reznik <jreznik at redhat.com>
Date: Wed Jul 20 16:15:51 2011 +0200
initial import
.gitignore | 1 +
herqq-0.9.1-correct-libdir.patch | 14 ++++++
herqq-0.9.1-disable-bundled-qtsoap.patch | 43 +++++++++++++++++
herqq-0.9.1-qtsoap-library.patch | 35 ++++++++++++++
herqq.spec | 74 ++++++++++++++++++++++++++++++
sources | 1 +
6 files changed, 168 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..175179f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/herqq-0.9.1.zip
diff --git a/herqq-0.9.1-correct-libdir.patch b/herqq-0.9.1-correct-libdir.patch
new file mode 100644
index 0000000..8e33f53
--- /dev/null
+++ b/herqq-0.9.1-correct-libdir.patch
@@ -0,0 +1,14 @@
+diff -up herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro.correct-libdir herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro
+--- herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro.correct-libdir 2011-02-23 22:20:56.000000000 +0100
++++ herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro 2011-02-24 15:21:04.304708085 +0100
+@@ -61,8 +61,8 @@ isEmpty(PREFIX) {
+ PREFIX = ../../deploy
+ }
+
+-INSTLOC_INC = $$PREFIX/include/HUpnpCore
+-INSTLOC_LIB = $$PREFIX/lib
++INSTLOC_INC = $$[QT_INSTALL_HEADERS]/HUpnpCore
++INSTLOC_LIB = $$[QT_INSTALL_LIBS]
+
+ includes.files += ../../include/HUpnpCore/H*
+ includes.path = $$INSTLOC_INC
diff --git a/herqq-0.9.1-disable-bundled-qtsoap.patch b/herqq-0.9.1-disable-bundled-qtsoap.patch
new file mode 100644
index 0000000..4801b55
--- /dev/null
+++ b/herqq-0.9.1-disable-bundled-qtsoap.patch
@@ -0,0 +1,43 @@
+diff -up herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro.disable-bundled-qtsoap herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro
+--- herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro.disable-bundled-qtsoap 2011-02-23 22:20:56.000000000 +0100
++++ herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro 2011-02-24 14:35:41.034987829 +0100
+@@ -8,12 +8,16 @@ VERSION = 0.9.1
+
+ QMAKE_CXXFLAGS_WARN_ON +=
+
+-INCLUDEPATH += \
+- ../../include/ \
+- ../../lib/qtsoap-2.7-opensource/src
++INCLUDEPATH += ../../include/
++
++CONFIG(DISABLE_QTSOAP): {
++ INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtSoap
++} else {
++ INCLUDEPATH += ../../lib/qtsoap-2.7-opensource/src
++}
+
+ LIBS += -L"../../bin/"
+-LIBS += -L"../../lib/qtsoap-2.7-opensource/lib"
++!CONFIG(DISABLE_QTSOAP): LIBS += -L"../../lib/qtsoap-2.7-opensource/lib"
+
+ debug:DEFINES += DEBUG
+
+@@ -50,11 +54,13 @@ include (devicemodel/devicemodel.pri)
+ include (dataelements/dataelements.pri)
+ include (devicehosting/devicehosting.pri)
+
+-win32 {
+- QMAKE_POST_LINK += copy ..\\..\\lib\\qtsoap-2.7-opensource\\lib\\* ..\\..\\bin /Y
+-}
+-else {
+- QMAKE_POST_LINK += cp -fR ../../lib/qtsoap-2.7-opensource/lib/* ../../bin/
++!CONFIG(DISABLE_QTSOAP): {
++ win32 {
++ QMAKE_POST_LINK += copy ..\\..\\lib\\qtsoap-2.7-opensource\\lib\\* ..\\..\\bin /Y
++ }
++ else {
++ QMAKE_POST_LINK += cp -fR ../../lib/qtsoap-2.7-opensource/lib/* ../../bin/
++ }
+ }
+
+ isEmpty(PREFIX) {
diff --git a/herqq-0.9.1-qtsoap-library.patch b/herqq-0.9.1-qtsoap-library.patch
new file mode 100644
index 0000000..3920518
--- /dev/null
+++ b/herqq-0.9.1-qtsoap-library.patch
@@ -0,0 +1,35 @@
+diff -up herqq-0.9.1/hupnp/lib/qtsoap-2.7-opensource/common.pri.qtsoap-library herqq-0.9.1/hupnp/lib/qtsoap-2.7-opensource/common.pri
+--- herqq-0.9.1/hupnp/lib/qtsoap-2.7-opensource/common.pri.qtsoap-library 2011-02-23 22:20:54.000000000 +0100
++++ herqq-0.9.1/hupnp/lib/qtsoap-2.7-opensource/common.pri 2011-07-19 14:20:57.689491644 +0200
+@@ -1,6 +1,6 @@
+ infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsoap-uselib
+ TEMPLATE += fakelib
+-QTSOAP_LIBNAME = $$qtLibraryTarget(QtSolutions_SOAP-2.7)
++QTSOAP_LIBNAME = $$qtLibraryTarget(qtsoap)
+ TEMPLATE -= fakelib
+ QTSOAP_LIBDIR = ../lib
+ unix:qtsoap-uselib:!qtsoap-buildlib:QMAKE_RPATHDIR += .
+diff -up herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro.qtsoap-library herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro
+--- herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro.qtsoap-library 2011-07-19 14:18:34.799962699 +0200
++++ herqq-0.9.1/hupnp/src/hupnp_core/hupnp_core.pro 2011-07-19 14:18:34.804962755 +0200
+@@ -23,17 +23,17 @@ debug:DEFINES += DEBUG
+
+ win32 {
+ debug {
+- LIBS += -lQtSolutions_SOAP-2.7d
++ LIBS += -lqtsoap
+ }
+ else {
+- LIBS += -lQtSolutions_SOAP-2.7
++ LIBS += -lqtsoap
+ }
+
+ LIBS += -lws2_32
+ TARGET_EXT = .dll
+ }
+ else {
+- LIBS += -lQtSolutions_SOAP-2.7
++ LIBS += -lqtsoap
+ }
+
+ OBJECTS_DIR = obj
diff --git a/herqq.spec b/herqq.spec
new file mode 100644
index 0000000..f2ae565
--- /dev/null
+++ b/herqq.spec
@@ -0,0 +1,74 @@
+Name: herqq
+Version: 0.9.1
+Release: 3%{?dist}
+Summary: A software library for building UPnP devices and control points
+# test application is GPLv3 but we do not ship it
+License: LGPLv3+
+URL: http://herqq.org/
+Source0: http://downloads.sourceforge.net/project/hupnp/hupnp/%{name}-%{version}.zip
+Patch0: herqq-0.9.1-disable-bundled-qtsoap.patch
+Patch1: herqq-0.9.1-correct-libdir.patch
+Patch2: herqq-0.9.1-qtsoap-library.patch
+
+
+BuildRequires: desktop-file-utils
+BuildRequires: qt4-devel
+BuildRequires: qtsoap-devel
+
+
+%description
+Herqq UPnP (HUPnP) is a software library for building UPnP
+devices and control points conforming to the UPnP Device
+Architecture version 1.1.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+%description devel
+Header files for developing applications using %{name}.
+
+%prep
+%setup -q
+
+# really disable bundled qtsoap, patch sent upstream on Feb 24
+%patch0 -p1 -b .disable-bundled-qtsoap.patch
+# fix install dir, patch sent upstream on Feb 24
+%patch1 -p1 -b .correct-libdir
+# lQtSolutions to lqtsoap
+%patch2 -p1 -b .qtsoap-library
+
+%build
+# we have to disable bundled QtSOAP library
+qmake-qt4 PREFIX=%{_prefix} -config DISABLE_QTSOAP \
+ -config DISABLE_TESTAPP
+make %{?_smp_mflags}
+
+%install
+make INSTALL_ROOT=%{buildroot} install
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc hupnp/ChangeLog hupnp/LICENSE_LGPLv3.txt
+%{_qt4_libdir}/libHUpnp.so.0*
+
+%files devel
+%{_qt4_libdir}/libHUpnp.so
+%{_qt4_headerdir}/HUpnpCore/
+
+%changelog
+* Wed Jul 20 2011 Jaroslav Reznik <jreznik at redhat.com> - 0.9.1-3
+- fix license to LGPLv3+
+- qt4 header dir for consistency
+- shlib soname tracked in %files
+- -devel should not duplicate COPYING
+
+* Tue Jul 19 2011 Jaroslav Reznik <jreznik at redhat.com> - 0.9.1-2
+- qtsoap library
+- cleanup SPEC file
+
+* Tue Feb 22 2011 Jaroslav Reznik <jreznik at redhat.com> - 0.9.1-1
+- Initial spec file
diff --git a/sources b/sources
index e69de29..25e5b10 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cb0d080da22b649a5916796bbf4d2c28 herqq-0.9.1.zip
More information about the scm-commits
mailing list