rpms/kickpim/devel kickpim.spec,1.9,1.10

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kickpim.spec 
Log Message:
* Tue Oct 11 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.3-8
- use -fPIC on all archs (TODO: make --with-pic work properly)
- absolute->relative symlinks



Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kickpim.spec	8 Aug 2005 15:32:09 -0000	1.9
+++ kickpim.spec	11 Oct 2005 13:34:43 -0000	1.10
@@ -3,7 +3,7 @@
 Name:    kickpim
 Summary: KDE kicker applet to access addressbook
 Version: 0.5.3
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 
 License: GPL
 Group:   Applications/Productivity
@@ -14,19 +14,17 @@
 # remove build dep on qt-3.2
 Patch1: kickpim-0.5.3-qtdesigner.patch
 
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf 
 
-# Dynamically determine qt/kde dependancies, 
-# depending on what we're built against.
 BuildRequires: qt-devel >= 1:3.3
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel )
-Requires: qt >= 1:%{qt_ver}
 BuildRequires: kdelibs-devel >= 6:3.3
-%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel )
-Requires: kdelibs >= 6:%{kdelibs_ver}
 BuildRequires: kdepim-devel >= 6:3.3
-#define kdepim_ver %(rpm -q --qf '%%{version}' kdepim-devel )
-#Requires: kdepim >= 6:%{kdepim_ver}
+# Probably extraneous in Extras context, but can't hurt -- Rex
+%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )}
+%define kdelibs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' kdelibs-devel )}
+Requires: qt >= 1:%{qt_ver}
+Requires: kdelibs >= 6:%{kdelibs_ver}
+#
 Requires: kdebase
 
 %description
@@ -43,10 +41,12 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 
-%ifarch x86_64
+# rpmlint says we should build pic objects (on all archs) 
+#ifarch x86_64
 export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
-%endif
+#endif
 
 %configure \
   --disable-rpath \
@@ -56,11 +56,27 @@
 make %{?_smp_mflags}
 
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
+# Replace absolute symlinks with relative ones
+if [ -d $RPM_BUILD_ROOT%{_docdir}/HTML ]; then
+pushd $RPM_BUILD_ROOT%{_docdir}/HTML
+for lang in *; do
+  if [ -d $lang ]; then
+    pushd $lang
+    for i in *; do
+      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+    done
+    popd
+  fi
+done
+popd
+fi
+
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -88,6 +104,10 @@
 
 
 %changelog
+* Tue Oct 11 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.3-8
+- use -fPIC on all archs (TODO: make --with-pic work properly)
+- absolute->relative symlinks
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.5.3
 - rebuild on all arches