summaryrefslogtreecommitdiffstats
path: root/mageia
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2013-12-28 20:38:50 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2013-12-28 20:38:50 +0100
commit37e11c19d7d1ac39f18b9dba1bffee0dc09f9e08 (patch)
treec37795f07a7191f6e647a2ae3e093fa1cdd24849 /mageia
parent4a3e6e0caf179b6ba22f5fb76a6208f3e84ceade (diff)
downloadtde-packaging-37e11c19d7d1ac39f18b9dba1bffee0dc09f9e08.tar.gz
tde-packaging-37e11c19d7d1ac39f18b9dba1bffee0dc09f9e08.zip
RPM Packaging: update 3.5.13.2 for Fedora 20
Diffstat (limited to 'mageia')
-rw-r--r--mageia/dependencies/qt3/qt3-3.5.13.2.spec14
1 files changed, 11 insertions, 3 deletions
diff --git a/mageia/dependencies/qt3/qt3-3.5.13.2.spec b/mageia/dependencies/qt3/qt3-3.5.13.2.spec
index 83e38e489..92ddd5cdc 100644
--- a/mageia/dependencies/qt3/qt3-3.5.13.2.spec
+++ b/mageia/dependencies/qt3/qt3-3.5.13.2.spec
@@ -27,7 +27,7 @@
Name: qt3
Version: 3.3.8.d
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+ and QPL
Summary: Qt3 Sources
Group: System/Libraries
@@ -73,7 +73,7 @@ Buildroot: %_tmppath/%name-%version-%release-root
%if %buildSQL
BuildRequires: mysql-devel
BuildRequires: unixODBC-devel
-BuildRequires: libpq-devel
+BuildRequires: postgresql-devel
%endif
BuildRequires: freetype2-devel
BuildRequires: mesaglu-devel
@@ -99,7 +99,6 @@ BuildRequires: pkgconfig(libpng15)
BuildRequires: zlib-devel
BuildRequires: nas-devel
BuildRequires: libiodbc-devel
-BuildRequires: postgresql-devel
BuildRequires: cups-devel
%if "%{_lib}" != "lib"
@@ -787,11 +786,20 @@ install -m 0755 %SOURCE9 %buildroot/%_sysconfdir/X11/xinit.d/
# Fix all buildroot paths
+#
+# Fix path in qmake.conf
+#
+%__sed -i ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/*/qmake.conf \
+ -e "s|QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = %{_libdir}|"
+
%clean
rm -fr %buildroot
%changelog
+* Mon Sep 09 2013 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-5
+- Fix path in qmake.conf
+
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-4
- Initial release for TDE 3.5.13.2