Changeset 1139

Timestamp:

Mar 14, 2013, 8:56:09 PM (13 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Use /@unixroot for Qt system paths (it now works) and fix zip generation.

File:

• packaging/qt4.spec (modified) (2 diffs)

packaging/qt4.spec

@@ -661 +661 @@
 export MAKESHELL=%{os2_boot_drive}\\OS2\\CMD.EXE
 
-# Qt doesn't understand /@unixroot in library paths, replace it with $(UNIXROOT)
-library_paths=$(echo \
-    --official-build-quiet $QT_BUILD_ID \
-    -prefix "%{qt_prefix}" \
-    -datadir "%{qt_datadir}" \
-    -libdir "%{qt_libdir}" \
-    -headerdir "%{qt_headerdir}" \
-    -bindir "%{qt_bindir}" \
-    -plugindir "%{qt_plugindir}" \
-    -importdir "%{qt_importdir}" \
-    -demosdir "%{qt_demosdir}" \
-    -examplesdir "%{qt_examplesdir}" \
-    -docdir "%{qt_docdir}" \
-    -translationdir "%{qt_translationdir}" \
-    -sysconfdir "%{qt_sysconfdir}" \
-| sed -re 's,/@unixroot,$(UNIXROOT),g')
+library_paths='
+    --official-build-quiet $QT_BUILD_ID
+    -prefix "%{qt_prefix}"
+    -datadir "%{qt_datadir}"
+    -libdir "%{qt_libdir}"
+    -headerdir "%{qt_headerdir}"
+    -bindir "%{qt_bindir}"
+    -plugindir "%{qt_plugindir}"
+    -importdir "%{qt_importdir}"
+    -demosdir "%{qt_demosdir}"
+    -examplesdir "%{qt_examplesdir}"
+    -docdir "%{qt_docdir}"
+    -translationdir "%{qt_translationdir}"
+    -sysconfdir "%{qt_sysconfdir}"'
 
 BUILDDIR_D=$(echo "%{_builddir}/%{buildsubdir}" | sed -re 's,/,\\,g')
@@ -772 +770 @@
 %if "%{?create_zips_script}" != ""
 # @todo put split out .sym files back
-(cd "%{buildroot}.sym" && find . -type f -name '*.sym' -exec mv "{}" "../%{buildroot}/{}" \;)
+(cd "%{buildroot}.sym" && find . -type f -name '*.sym' -exec mv "{}" "%{buildroot}/{}" \;)
 rm -rf "%{buildroot}.sym"
-%{create_zips_script} "%{buildroot}" "%{_topdir}"
+%{create_zips_script} all "%{buildroot}" "%{_topdir}/zip"
 %endif
 %endif