rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim-0.22-qt33.patch, NONE, 1.1 libopensync-plugin-kdepim.spec, 1.8, 1.9

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18512

Modified Files:
	libopensync-plugin-kdepim.spec 
Added Files:
	libopensync-plugin-kdepim-0.22-qt33.patch 
Log Message:
- fix #308461


libopensync-plugin-kdepim-0.22-qt33.patch:

--- NEW FILE libopensync-plugin-kdepim-0.22-qt33.patch ---
diff -up libopensync-plugin-kdepim-0.22/m4/kde.m4.qt33 libopensync-plugin-kdepim-0.22/m4/kde.m4
--- libopensync-plugin-kdepim-0.22/m4/kde.m4.qt33	2007-09-27 09:36:46.000000000 +0200
+++ libopensync-plugin-kdepim-0.22/m4/kde.m4	2007-09-27 09:37:26.000000000 +0200
@@ -1217,7 +1217,7 @@ else
 fi
 
 if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib/qt-3.3"
 fi
 if test $kde_qtver = 2; then
    kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libopensync-plugin-kdepim.spec	22 Aug 2007 12:48:55 -0000	1.8
+++ libopensync-plugin-kdepim.spec	30 Oct 2007 07:13:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-kdepim
 Version:        0.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -9,6 +9,7 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.bz2
 Patch0:         libopensync-plugin-kdepim-Makefile.patch
+Patch1:		libopensync-plugin-kdepim-0.22-qt33.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -p1 -b .qt33
 autoreconf
 %build
 %configure --disable-rpath
@@ -62,6 +64,9 @@
 %{_datadir}/opensync/defaults/kdepim-sync
 
 %changelog
+* Thu Sep 27 2007 Oliver Falk <oliver at linux-kernel.at> 0.22-3
+- Add patch to support finding qt 3.3 in /usr/lib/qt-3.3
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.22-2
 - new license tag
 - rebuild for buildid