rpms/qt-assistant-adp/devel 01_build_system.diff, NONE, 1.1 QAssistantClient, NONE, 1.1 QtAssistant, NONE, 1.1 .cvsignore, 1.2, 1.3 qt-assistant-adp.spec, 1.3, 1.4 sources, 1.2, 1.3
Kevin Kofler
kkofler at fedoraproject.org
Mon Jul 5 06:31:29 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/qt-assistant-adp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31294/devel
Modified Files:
.cvsignore qt-assistant-adp.spec sources
Added Files:
01_build_system.diff QAssistantClient QtAssistant
Log Message:
* Mon Jul 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.3-1
- new upstream tarball with only the compat assistant_adp and QAssistantClient
- build fixes from Debian (Fathi Boudra)
- use find_lang to package the qm files (#609749)
01_build_system.diff:
b/lib/QtAssistant/qassistantclient_global.h | 1 +
compat.pro | 6 ++++--
lib/lib.pro | 6 +++---
3 files changed, 8 insertions(+), 5 deletions(-)
--- NEW FILE 01_build_system.diff ---
Description: several workarounds for the build system which is completely broken
Author: Fathi Boudra <fabo at 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"
--- NEW FILE QAssistantClient ---
#include "qassistantclient.h"
--- NEW FILE QtAssistant ---
#ifndef QT_QTASSISTANT_MODULE_H
#define QT_QTASSISTANT_MODULE_H
#include <QtNetwork/QtNetwork>
#include "qassistantclient.h"
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-assistant-adp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 16 Mar 2010 12:25:30 -0000 1.2
+++ .cvsignore 5 Jul 2010 06:31:28 -0000 1.3
@@ -1 +1 @@
-qt-everywhere-opensource-src-4.6.2.tar.gz
+qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
Index: qt-assistant-adp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-assistant-adp/devel/qt-assistant-adp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qt-assistant-adp.spec 16 Mar 2010 15:30:10 -0000 1.3
+++ qt-assistant-adp.spec 5 Jul 2010 06:31:28 -0000 1.4
@@ -1,13 +1,18 @@
Summary: Compatibility version of Qt Assistant
Name: qt-assistant-adp
-Version: 4.6.2
-Release: 2%{?dist}
+Version: 4.6.3
+Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
Group: System Environment/Libraries
Url: http://qt.nokia.com/doc/4.6/qassistantclient.html
-Source: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
+Source: ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-%{version}.tar.gz
+# missing header files from Debian (Fathi Boudra)
+Source1: QAssistantClient
+Source2: QtAssistant
+# build fixes from Debian (Fathi Boudra)
+Patch1: 01_build_system.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel >= 4.7.0
@@ -41,23 +46,24 @@ Framework introduced in Qt 4.4 and/or th
%prep
-%setup -q -n qt-everywhere-opensource-src-%{version}
+%setup -q -n qt-assistant-qassistantclient-library-compat-src-%{version}
+%patch1 -p1 -b .build_system
+mkdir include
+cp -p %{SOURCE1} %{SOURCE2} include/
%build
# build assistant_adp
-cd tools/assistant/compat
-qmake-qt4 QT_SOURCE_TREE=../../.. QT_PRODUCT=OpenSource
+qmake-qt4 QT_PRODUCT=OpenSource
make %{?_smp_mflags}
# build libQtAssistantClient
cd lib
-qmake-qt4 QT_SOURCE_TREE=../../../.. QT_BUILD_TREE=../../../.. \
- CONFIG=create_prl QMAKE_CXXFLAGS=-I../../../../include
+qmake-qt4 CONFIG=create_prl
make %{?_smp_mflags}
# build assistant_adp translations
-cd ../../../../translations
+cd ../translations
lrelease-qt4 assistant_adp_*.ts
cd ..
@@ -66,17 +72,22 @@ cd ..
rm -rf %{buildroot}
# install assistant_adp
-make install INSTALL_ROOT=%{buildroot} -C tools/assistant/compat
+make install INSTALL_ROOT=%{buildroot}
# install libQtAssistantClient
-make install INSTALL_ROOT=%{buildroot} -C tools/assistant/compat/lib
+make install INSTALL_ROOT=%{buildroot} -C lib
# install assistant_adp translations
mkdir -p %{buildroot}%{_qt4_translationdir}
-install -p -m644 translations/assistant_adp_*.qm %{buildroot}%{_qt4_translationdir}/
+install -p -m644 translations/assistant_adp_*.qm \
+ %{buildroot}%{_qt4_translationdir}/
# install assistant.prf mkspec
-install -D -p -m644 mkspecs/features/assistant.prf %{buildroot}%{_qt4_datadir}/mkspecs/features/assistant.prf
+install -D -p -m644 features/assistant.prf \
+ %{buildroot}%{_qt4_datadir}/mkspecs/features/assistant.prf
+
+# install missing headers (thanks to Fathi Boudra from Debian)
+install -p -m644 include/Q* %{buildroot}%{_qt4_headerdir}/QtAssistant/
# nuke dangling reference(s) to the buildroot
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
@@ -100,6 +111,8 @@ popd
# viewing anything different. The .adp file needs to be passed on the command
# line, which is usually done by the application.
+%find_lang assistant_adp --with-qt --without-mo
+
%clean
rm -rf %{buildroot}
@@ -109,13 +122,12 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%files
+%files -f assistant_adp.lang
%defattr(-,root,root,-)
%doc README LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
%{_bindir}/assistant_adp
%{_qt4_bindir}/assistant_adp
%{_qt4_libdir}/libQtAssistantClient.so.4*
-%{_qt4_translationdir}/assistant_adp_*.qm
%files devel
%defattr(-,root,root,-)
@@ -128,6 +140,11 @@ rm -rf %{buildroot}
%changelog
+* Mon Jul 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.3-1
+- new upstream tarball with only the compat assistant_adp and QAssistantClient
+- build fixes from Debian (Fathi Boudra)
+- use find_lang to package the qm files (#609749)
+
* Tue Mar 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.6.2-2
- use versioned BR/Requires to avoid Conflicts
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-assistant-adp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 16 Mar 2010 12:25:31 -0000 1.2
+++ sources 5 Jul 2010 06:31:28 -0000 1.3
@@ -1 +1 @@
-eb651ee4b157c01696aa56777fc6e0e5 qt-everywhere-opensource-src-4.6.2.tar.gz
+a20148e0488d5c12ab35ccc107dcc64d qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
More information about the scm-commits
mailing list