Changeset 1091

Timestamp:

Sep 15, 2011, 11:03:31 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

Spec for release 4.7.3-1.

File:

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

packaging/qt4.spec

@@ -19 +19 @@
 %define rpm_release 1
 
-%define svn_revision    1070
+%define svn_url     http://svn.netlabs.org/repos/qt4/tags/%{version}
 
 %define descr_brief Qt is a software toolkit for developing applications.
@@ -59 +59 @@
 %if "%{?QT_SOURCE_TREE}" == ""
 %define QT_SOURCE_TREE .
-%endif
-
-# @todo temporary
+%else
 %define skip_prep_export 1
+%endif
 
 # installation paths
@@ -595 +594 @@
 %if !0%{?skip_prep}
 
-%if "%{?QT_SOURCE_TREE}" != ""
+%if 0%{?master_mode}
 %if !0%{?skip_prep_export}
-# get clean source tree from SVN
+# get clean source tree from SVN (both for building and for SRPM)
 %setup -n "%{name}-%{version}" -Tc
-svn export -r %{svn_revision} %{QT_SOURCE_TREE} .
+svn export %{svn_url} . --force
+rm -f "%{_sourcedir}/%{name}-%{version}.zip"
+(cd .. && zip -SrX9 "%{_sourcedir}/%{name}-%{version}.zip" "%{name}-%{version}")
 %else
-# use passed source tree as is (shadow build)
+# use source tree in %{QT_SOURCE_TREE} (e.g. shadow build)
 %setup -n "%{name}-%{version}" -Tc%{?skip_prep_clean:D}
 %endif
@@ -619 +620 @@
 die() { echo "ERROR: $@"; exit 1; }
 check_var() { eval "[ -n \"\$$1\" ] || die \"$1 variable is not set.\""; }
+
+%if "%{?svn_revision}" == ""
+QT_BUILD_ID=$(svn info %{svn_url} | sed -nre 's/^Last Changed Rev: ([0-9]+)$/\1/p')
+[ -z "$QT_BUILD_ID" ] && die "Cannot determine SVN revision."
+%else
+QT_BUILD_ID=%{svn_revision}
+%endif
 
 # Qt source tree (DOS format)
@@ -630 +638 @@
 check_var "PSQL_LIBS"
 
+# Non-root UNIXROOT is not currently supported because of make install
+# that will install to a subtree in such case (which is not expected
+# by %install below). @todo One solution is to move everything from that
+# subtree right to %{buildroot}/@unixroot after make install.
+[ -z "$(echo "$UNIXROOT" | sed -re 's/^[a-bA-b]:$//')" ] || \
+    die "UNIXROOT must be the root directory"
+
 [ -z "$MAKE_JOBS" ] && MAKE_JOBS=1
 
@@ -640 +655 @@
 # Qt doesn't understand /@unixroot in library paths, replace it with $(UNIXROOT)
 library_paths=$(echo \
-    --official-build-quiet %{svn_revision} \
+    --official-build-quiet $QT_BUILD_ID \
     -prefix "%{qt_prefix}" \
     -datadir "%{qt_datadir}" \
@@ -662 +677 @@
 export BEGINLIBPATH="$BUILDDIR_D\\bin\;$BEGINLIBPATH"
 
-# temporarily reset UNIXROOT so that install targets will get only Qt prefixes
-# w/o the UNIXROOT directory chain (if it's not at root)
-UNIXROOT_OLD="$UNIXROOT"
-export UNIXROOT=/.
-
 cmd /c $QT_SOURCE_TREE_D\\configure.cmd $library_paths
 
 make -j$MAKE_JOBS
-
-# resture UNIXROOT
-export UNIXROOT="$UNIXROOT_OLD"
 
 %if !0%{?skip_build_docs}
@@ -744 +751 @@
 #------------------------------------------------------------------------------
 
-#rm -rf %{buildroot}
+%if !0%{?skip_clean}
+
+%if 0%{?master_mode}
+%if "%{?create_zips_script}" != ""
+%{create_zips_script} %{buildroot}
+%endif
+%endif
+
+rm -rf %{buildroot}
+
+%endif # if !0%{?skip_clean}
 
 #------------------------------------------------------------------------------
 %changelog
+* Thu Sep 15 2011 Dmitriy Kuminov <dmik/coding.org> 4.7.3-1
+- New release 4.7.3. See %{pkg_docdir}/changes-4.7.3 and
+  %{pkg_docdir}/CHANGES.OS2 for more information.