rpms/kile/devel kile.spec,1.29,1.30

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kile.spec 
Log Message:
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.2-4
- revert to saner/simpler symlink handling



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kile.spec	28 Aug 2006 12:43:06 -0000	1.29
+++ kile.spec	29 Aug 2006 15:37:07 -0000	1.30
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -47,7 +47,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -62,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --add-category="X-Fedora" --vendor="" \
@@ -72,29 +71,18 @@
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.1)
+# HTML (1.0)
 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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    ## NEW: automated abs symlink -> rel symlink conversion -- Rex
-    ## not sure if this is worth the extra effort, but here it is...
+    # replace absolute symlinks with relative ones
     pushd $lang_dir
-    ROOT=$(echo $(pwd) | sed -e "s|$RPM_BUILD_ROOT||")
-    LINKS=$(find . -type l )
-    for LINK in $LINKS ; do
-    DST=$(echo $LINK | sed -e "s|./||" )
-    PRE=$(echo $DST | tr -c -d '/' | sed -e 's|/|../|g')
-    # skip if $SRC not inside $ROOT
-    test -z "$PRE" && continue
-    POST=$(readlink $LINK | sed -e "s|$ROOT||" )
-    # skip if not abs symlink
-    test -z "$(echo $POST | grep '^/')" && continue
-    SRC=$(echo $PRE$POST | sed -e 's|//|/|g')
-    rm -f $DST && ln -s $SRC $DST
-    done
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
     popd
   fi
 done
@@ -132,6 +120,9 @@
 
 
 %changelog
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.2-4
+- revert to saner/simpler symlink handling
+
 * Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.2-3
 - fc6 respin