rpms/kickpim/FC-4 kickpim.spec,1.8,1.9

[Rex Dieter (rdieter)]

Author: rdieter

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

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/FC-4/kickpim.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kickpim.spec	23 May 2005 00:25:25 -0000	1.8
+++ kickpim.spec	11 Oct 2005 13:34:37 -0000	1.9
@@ -3,37 +3,29 @@
 Name:    kickpim
 Summary: KDE kicker applet to access addressbook
 Version: 0.5.3
-Release: 7%{?dist_tag}
+Release: 8%{?dist} 
 
 License: GPL
 Group:   Applications/Productivity
 URL:     http://kickpim.sourceforge.net/
 Source:  http://dl.sourceforge.net/sourceforge/kickpim/kickpim-0.5.3.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # remove build dep on qt-3.2
 Patch1: kickpim-0.5.3-qtdesigner.patch
 
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf 
 
-# to workaround missing Requires in redhat's qt-devel, kdelibs-devel
-# and to make fedora's buildsystem happy
-BuildRequires: XFree86-devel
-BuildRequires: libpng-devel zlib-devel libjpeg-devel
-BuildRequires: arts-devel libart_lgpl-devel
-
-BuildRequires: kdepim-devel >= 6:3.1
-Requires: kdebase
-
-# 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. -f-2)
+BuildRequires: qt-devel >= 1:3.3
+BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdepim-devel >= 6:3.3
+# 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}
-
-BuildRequires: kdelibs-devel >= 6:3.1
-%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel )
 Requires: kdelibs >= 6:%{kdelibs_ver}
+#
+Requires: kdebase
 
 %description
 KickPIM is a panel applet for quickly editing and accessing the KDE
@@ -49,25 +41,53 @@
 
 %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 \
   %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings }
+  %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
 
 make %{?_smp_mflags}
 
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name}
+# 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
+# HTML
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+  lang=$(basename $lang_dir)
+  echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
+done
+fi
 
 
 %files -f %{name}.lang
@@ -76,14 +96,18 @@
 %{_libdir}/lib*
 %{_datadir}/apps/kicker/applets/*.desktop
 %{_datadir}/apps/kickpim
-%lang(en) %doc %{_docdir}/HTML/en/*
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+
 %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