Hello community, here is the log from the commit of package qt4-assistant-adp for openSUSE:Factory checked in at Mon Sep 27 16:16:16 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt4-assistant-adp/qt4-assistant-adp.changes 2010-09-27 13:51:21.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Sep 27 13:50:55 CEST 2010 - dmueller@suse.de + +- Initial package (4.6.3) + calling whatdependson for head-i586 New: ---- add-camelcase-headers.diff baselibs.conf fix_build_system.diff hardcode-lib-version.diff qt4-assistant-adp.changes qt4-assistant-adp.spec qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt4-assistant-adp.spec ++++++ # # spec file for package qt4-assistant-adp (Version 4.6.3) # # Copyright (c) 2010 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: qt4-assistant-adp BuildRequires: libqt4-devel BuildRequires: fdupes update-desktop-files Url: http://www.qtsoftware.com License: GPLv2 ; GPLv3 Group: System/Libraries Summary: C++ Program Library, Core Components Version: 4.6.3 Release: 1 Source: qt-assistant-qassistantclient-library-compat-src-%version.tar.bz2 Source2: baselibs.conf Patch0: fix_build_system.diff Patch1: hardcode-lib-version.diff Patch2: add-camelcase-headers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libQtAssistantClient4 = %version Provides: libqt4-devel-doc:/usr/bin/assistant_adp %description Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. Authors: -------- Qt Software %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt-assistant-qassistantclient-library-compat-version-%version %patch0 -p1 %patch1 %patch2 %package devel License: GPLv2 ; GPLv3 Group: Development/Libraries/X11 Summary: Qt Development Kit Requires: %name = %version %description devel You need this package, if you want to compile programs with Qt. It contains the "Qt Crossplatform Development Kit". It does contain include files and development applications like GUI designers, translator tools and code generators. %package -n libQtAssistantClient4 License: GPLv2 ; GPLv3 Group: Development/Libraries/X11 Summary: Qt Development Kit %description -n libQtAssistantClient4 You need this package, if you want to compile programs with Qt. It contains the "Qt Crossplatform Development Kit". It does contain include files and development applications like GUI designers, translator tools and code generators. %build export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" qmake make %{?jobs:-j %jobs} pushd lib qmake make %{?jobs:-j %jobs} popd pushd translations lrelease assistant_adp_*.ts popd %install make INSTALL_ROOT=$RPM_BUILD_ROOT install pushd lib make INSTALL_ROOT=$RPM_BUILD_ROOT install popd mkdir -p %{buildroot}/usr/share/qt4/translations/ install -p -m 644 translations/assistant_adp_*.qm %{buildroot}/usr/share/qt4/translations/ %clean rm -rf $RPM_BUILD_ROOT %post -n libQtAssistantClient4 -p /sbin/ldconfig %postun -n libQtAssistantClient4 -p /sbin/ldconfig %files %defattr(-,root,root,755) /usr/bin/assistant_adp /usr/share/qt4/translations/assistant_adp_*.qm %files -n libQtAssistantClient4 %defattr(-,root,root,755) %_libdir/libQtAssistantClient.so.4* %files devel %defattr(644,root,root,755) /usr/include/QtAssistant %_libdir/libQtAssistantClient.so %changelog ++++++ add-camelcase-headers.diff ++++++ --- lib/lib.pro +++ lib/lib.pro @@ -62,7 +62,7 @@ } qt_install_headers { - assistant_headers.files = qassistantclient.h qassistantclient_global.h + assistant_headers.files = qassistantclient.h qassistantclient_global.h QtAssistant/QAssistantClient QtAssistant/QAssistant assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant INSTALLS += assistant_headers } --- lib/QtAssistant/QAssistantClient +++ lib/QtAssistant/QAssistantClient @@ -0,0 +1 @@ +#include "qassistantclient.h" --- lib/QtAssistant/QtAssistant +++ lib/QtAssistant/QtAssistant @@ -0,0 +1,5 @@ +#ifndef QT_QTASSISTANT_MODULE_H +#define QT_QTASSISTANT_MODULE_H +#include <QtNetwork/QtNetwork> +#include "qassistantclient.h" +#endif ++++++ baselibs.conf ++++++ libQtAssistantClient4 ++++++ fix_build_system.diff ++++++ Description: several workarounds for the build system which is completely broken Author: Fathi Boudra <fabo@debian.org> --- a/compat.pro +++ b/compat.pro @@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad translations/assistant_adp_zh_CN.ts \ translations/assistant_adp_zh_TW.ts -unix:!contains(QT_CONFIG, zlib):LIBS += -lz - contains(CONFIG, static): { win32 { exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) { @@ -81,3 +79,7 @@ contains(CONFIG, static): { } } } + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target + --- a/lib/lib.pro +++ b/lib/lib.pro @@ -16,8 +16,8 @@ HEADERS = qassistantclient.h \ qassistantclient_global.h SOURCES = qassistantclient.cpp -DESTDIR = ../../../../lib -DLLDESTDIR = ../../../../bin +DESTDIR = lib +DLLDESTDIR = bin unix { QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB @@ -62,7 +62,7 @@ win32 { } qt_install_headers { - assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES + assistant_headers.files = qassistantclient.h qassistantclient_global.h assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant INSTALLS += assistant_headers } --- /dev/null +++ b/lib/QtAssistant/qassistantclient_global.h @@ -0,0 +1 @@ +#include "../qassistantclient_global.h" ++++++ hardcode-lib-version.diff ++++++ --- lib/lib.pro +++ lib/lib.pro @@ -1,11 +1,7 @@ TEMPLATE = lib QT += network TARGET = QtAssistantClient -isEmpty(QT_MAJOR_VERSION) { - VERSION=4.3.0 -} else { - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} -} +VERSION=4.6.3 CONFIG += qt warn_on mac|win32:CONFIG += debug_and_release ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org