Changeset 1139


Ignore:
Timestamp:
Mar 14, 2013, 8:56:09 PM (12 years ago)
Author:
Dmitry A. Kuminov
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/qt4.spec

    r1137 r1139  
    661661export MAKESHELL=%{os2_boot_drive}\\OS2\\CMD.EXE
    662662
    663 # Qt doesn't understand /@unixroot in library paths, replace it with $(UNIXROOT)
    664 library_paths=$(echo \
    665     --official-build-quiet $QT_BUILD_ID \
    666     -prefix "%{qt_prefix}" \
    667     -datadir "%{qt_datadir}" \
    668     -libdir "%{qt_libdir}" \
    669     -headerdir "%{qt_headerdir}" \
    670     -bindir "%{qt_bindir}" \
    671     -plugindir "%{qt_plugindir}" \
    672     -importdir "%{qt_importdir}" \
    673     -demosdir "%{qt_demosdir}" \
    674     -examplesdir "%{qt_examplesdir}" \
    675     -docdir "%{qt_docdir}" \
    676     -translationdir "%{qt_translationdir}" \
    677     -sysconfdir "%{qt_sysconfdir}" \
    678 | sed -re 's,/@unixroot,$(UNIXROOT),g')
     663library_paths='
     664    --official-build-quiet $QT_BUILD_ID
     665    -prefix "%{qt_prefix}"
     666    -datadir "%{qt_datadir}"
     667    -libdir "%{qt_libdir}"
     668    -headerdir "%{qt_headerdir}"
     669    -bindir "%{qt_bindir}"
     670    -plugindir "%{qt_plugindir}"
     671    -importdir "%{qt_importdir}"
     672    -demosdir "%{qt_demosdir}"
     673    -examplesdir "%{qt_examplesdir}"
     674    -docdir "%{qt_docdir}"
     675    -translationdir "%{qt_translationdir}"
     676    -sysconfdir "%{qt_sysconfdir}"'
    679677
    680678BUILDDIR_D=$(echo "%{_builddir}/%{buildsubdir}" | sed -re 's,/,\\,g')
     
    772770%if "%{?create_zips_script}" != ""
    773771# @todo put split out .sym files back
    774 (cd "%{buildroot}.sym" && find . -type f -name '*.sym' -exec mv "{}" "../%{buildroot}/{}" \;)
     772(cd "%{buildroot}.sym" && find . -type f -name '*.sym' -exec mv "{}" "%{buildroot}/{}" \;)
    775773rm -rf "%{buildroot}.sym"
    776 %{create_zips_script} "%{buildroot}" "%{_topdir}"
     774%{create_zips_script} all "%{buildroot}" "%{_topdir}/zip"
    777775%endif
    778776%endif
Note: See TracChangeset for help on using the changeset viewer.