Changeset 1094

Timestamp:

Sep 15, 2011, 8:21:37 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging. qt4.spec: Restore deleted .sym after packing to RPMs.

.sym are already necessary for CreateZIPs.

File:

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

packaging/qt4.spec

@@ -50 +50 @@
 #BuildRequires: psql-devel (when available)
 
-# @todo add wrc support to Qt!
+# @todo add wrc support to Qt
+# @todo add proper %attr for .exe files
 
 #------------------------------------------------------------------------------
@@ -470 +471 @@
 BuildArch:  noarch
 
+Requires:   lib%{name} = %{version}-%{release}
 Requires:   %{name}-assistant = %{version}-%{release}
 
@@ -480 +482 @@
 %files doc
 %defattr(-,root,root,-)
-%{qt_docdir}/qch/*.qch
+%doc %{qt_docdir}/qch/*.qch
 
 %post doc
@@ -740 +742 @@
 mv "%{buildroot}/%{qt_bindir}/qmake.exe" "%{buildroot}/%{_bindir}/"
 ln -s "%{_bindir}/qmake.exe" "%{buildroot}/%{qt_bindir}/qmake.exe"
-%endif
-
-# @todo temporarily delete .sym files (until we generate -debuginfo packages)
-find "%{buildroot}/" -type f -name "*.sym" -exec rm -f "{}" \;
+mv "%{buildroot}/%{qt_bindir}/qmake.sym" "%{buildroot}/%{_bindir}/"
+%endif
+
+# @todo temporarily split out .sym files (until we generate -debuginfo packages)
+for f in $(cd "%{buildroot}" && find -type f -name "*.sym"); do
+    fd="${f%/*}"/
+    [ "$fp" = "$f/" ] && fd=
+    [ -d "%{buildroot}.sym/$fd" ] || mkdir -p "%{buildroot}.sym/$fd"
+    mv "%{buildroot}/$f" "%{buildroot}.sym/$fd"
+done
 
 %endif # if !0%{?skip_install}
@@ -755 +763 @@
 %if 0%{?master_mode}
 %if "%{?create_zips_script}" != ""
-%{create_zips_script} %{buildroot}
+# @todo put split out .sym files back
+(cd "%{buildroot}.sym" && find . -type f -name '*.sym' -exec mv "{}" "../%{buildroot}/{}" \;)
+rm -rf "%{buildroot}.sym"
+%{create_zips_script} "%{buildroot}" "%{_topdir}"
 %endif
 %endif