jreznik pushed to kdelibs3 (epel7). "- more qt->qt3 fixes"

[notifications at fedoraproject.org]

>From 11c13ad6454a2fab6f7c884848b814a15b15edd4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed, 2 Apr 2008 13:10:08 +0000
Subject: - more qt->qt3 fixes


diff --git a/kdelibs3.spec b/kdelibs3.spec
index 5ae36e1..fad1ae1 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -8,12 +8,13 @@
 %define arts_epoch 8
 %define arts_version 1.5.9
 
-%define qt_epoch 1
-%define qt_version 3.3.8b
+%define qt3_epoch 1
+%define qt3_version 3.3.8b
 # unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
-#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
-%define qt_ver %{qt_version}
-%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
+#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
+%define qt3_ver %{qt3_version}
+# fix this?... -- Rex
+%define qt3_docdir %{_docdir}/qt-devel-%{qt_ver}
 
 %define kde_major_version 3
 
@@ -23,7 +24,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -81,8 +82,8 @@ Patch103: kdelibs-3.5.0-101956.patch
 ## upstream patches
 Patch200: kdelibs-3.5.9-kate-regression.patch
 
-%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
-Requires: qt >= %{qt_epoch}:%{qt_ver}
+#{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
+#Requires: qt3 >= %{qt3_epoch}:%{qt3_ver}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
@@ -257,7 +258,7 @@ sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{versi
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-export QTDOC=%{qtdocdir}
+export QTDOC=%{qt3_docdir}
 
 if [ -x /etc/profile.d/krb5.sh ]; then
   . /etc/profile.d/krb5.sh
@@ -573,6 +574,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-7
+- more qt->qt3 fixes
+
 * Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-6
 - s/qt-devel/qt3-devel/
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=11c13ad6454a2fab6f7c884848b814a15b15edd4