devel/kickpim kickpim.spec,1.4,1.5

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/devel/kickpim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10760

Modified Files:
	kickpim.spec 
Log Message:
fix x86_64 build, tighten kdelibs dep, cleanup configure call


Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/devel/kickpim/kickpim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kickpim.spec	10 Dec 2004 22:03:04 -0000	1.4
+++ kickpim.spec	10 Feb 2005 16:50:58 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: KDE kicker applet to access addressbook
 Epoch:	 0
 Version: 0.5.3
-Release: 4%{?dist_tag}
+Release: 5%{?dist_tag}
 License: GPL
 Group:	 Applications/Productivity
 URL:	 http://kickpim.sourceforge.net/
@@ -28,11 +28,11 @@
 # Dynamically determine qt,kdelibs dependancies, depending on 
 # what we're built against.
 BuildRequires: qt-devel >= 1:3.1
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2)
+%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2)
 Requires: qt >= 1:%{qt_ver}
 
 BuildRequires: kdelibs-devel >= 6:3.1
-%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 )
+%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel )
 Requires: kdelibs >= 6:%{kdelibs_ver}
 
 %description
@@ -50,15 +50,14 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+%ifarch x86_64
+export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
+%endif
+
 %configure \
   --disable-rpath \
-%if "%{?debug}" == "1"
-  --enable-debug --enable-warnings \
-%else
-  --disable-dependency-tracking \
-  --disable-debug --disable-warnings \
-  --enable-final
-%endif
+  %{?debug:  --enable-debug --enable-warnings } \
+  %{!?debug: --disable-debug --disable-warnings }
 
 make %{?_smp_mflags}
 
@@ -86,6 +85,11 @@
 
 
 %changelog
+* Mon Feb 07 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:0.5.3-5
+- fix x86_64 build (#147332)
+- tighten kdelibs dep
+- cleanup %%configure
+
 * Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:0.5.3-0.fdr.4
 - dynamically determine versions for qt,kdelibs dependancies.