Hello community, here is the log from the commit of package herqq for openSUSE:Factory checked in at 2013-12-31 10:04:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/herqq (Old) and /work/SRC/openSUSE:Factory/.herqq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "herqq" Changes: -------- --- /work/SRC/openSUSE:Factory/herqq/herqq.changes 2012-01-25 12:20:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.herqq.new/herqq.changes 2013-12-31 10:04:56.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Dec 30 00:05:36 UTC 2013 - [email protected] + +- Fix upstream URL +- Drop not required obsoletes and provides: herqq-libs never existed +- Pass -config DISABLE_TESTAPP, -config USE_QT_INSTALL_LOC + and PREFIX=%{_prefix} options to qmake call +- added patches: + * honour_lib_suffix.patch: makes libQtSolutions_SOAP honor + install library suffix when using Qt location option +- Stop manually moving libs and includes due to above changes: not + required anymore + +------------------------------------------------------------------- New: ---- honour_lib_suffix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ herqq.spec ++++++ --- /var/tmp/diff_new_pack.2U7Sby/_old 2013-12-31 10:04:57.000000000 +0100 +++ /var/tmp/diff_new_pack.2U7Sby/_new 2013-12-31 10:04:57.000000000 +0100 @@ -1,10 +1,7 @@ # # spec file for package herqq # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright 2010 [email protected] -# Copyright 2011 [email protected] -# Copyright 2011 Buschmann <[email protected]> +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +22,10 @@ Summary: A Library for Building UPnP Devices and Control Points License: LGPL-3.0 Group: Development/Libraries/Other -Url: http://herqq.org +Url: http://hupnp.linada.fi/ Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM honour_lib_suffix.patch -- in USE_QT_INSTALL_LOC case +Patch0: honour_lib_suffix.patch BuildRequires: fdupes BuildRequires: libqt4-devel >= 4.6.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,8 +40,6 @@ %package -n libHUpnp1 Summary: A Library for Building UPnP Devices and Control Points Group: Development/Libraries/KDE -Provides: %{name}-libs = %{version} -Obsoletes: %{name}-libs < %{version} %description -n libHUpnp1 Herqq UPnP (HUPnP) is a software library for building UPnP devices and control points conforming to the @@ -72,27 +69,17 @@ %prep %setup -q +%patch0 -p1 # Fix wrong EOL encoding: sed -i 's/\r//' hupnp/{LICENSE*.txt,lib/qtsoap-2.7-opensource/{LICENSE.*,README.TXT,LGPL_EXCEPTION.txt}} %build -qmake -r QMAKE_CXXFLAGS="%optflags -fvisibility-inlines-hidden" +qmake -r PREFIX=%{_prefix} QMAKE_CXXFLAGS="%optflags -fvisibility-inlines-hidden" \ + -config DISABLE_TESTAPP -config USE_QT_INSTALL_LOC make %{?_smp_mflags} %install -%make_install -mkdir -p %{buildroot}%{_libdir} -mkdir -p %{buildroot}%{_includedir}/HUpnpCore -pushd hupnp/bin -mv lib* %{buildroot}%{_libdir} -popd -pushd hupnp/include/HUpnpCore -cp H* %{buildroot}%{_includedir}/HUpnpCore/ -popd -pushd hupnp/deploy/include/HUpnpCore -mv * %{buildroot}%{_includedir}/HUpnpCore/ -popd -%fdupes %{buildroot}%{_includedir}/HUpnpCore/ +make INSTALL_ROOT=%{buildroot} install %post -n libHUpnp1 -p /sbin/ldconfig ++++++ honour_lib_suffix.patch ++++++ diff -Naur herqq-1.0.0.orig/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro herqq-1.0.0/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro --- herqq-1.0.0.orig/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro 2011-03-28 00:42:30.000000000 +0200 +++ herqq-1.0.0/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro 2013-12-30 00:48:34.728343414 +0100 @@ -14,11 +14,17 @@ #target.path = $$DESTDIR #INSTALLS += target -isEmpty(PREFIX) { - PREFIX = ../../../deploy +CONFIG(USE_QT_INSTALL_LOC) { + INSTLOC_LIB = $$[QT_INSTALL_LIBS] +} +else { + isEmpty(PREFIX) { + PREFIX = ./deploy + } + + INSTLOC_LIB = $$PREFIX/lib } -INSTLOC_LIB = $$PREFIX/lib target.path = $$INSTLOC_LIB INSTALLS += target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
