rpms/kiosktool/devel kiosktool.spec,1.2,1.3

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Nov 10 19:18:25 UTC 2005


Author: rdieter

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

Modified Files:
	kiosktool.spec 
Log Message:
* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-4
- --enable-final
- fix symlinks
- simplify configure



Index: kiosktool.spec
===================================================================
RCS file: /cvs/extras/rpms/kiosktool/devel/kiosktool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kiosktool.spec	4 Nov 2005 17:45:30 -0000	1.2
+++ kiosktool.spec	10 Nov 2005 19:18:23 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: KIOSK administration tool for KDE
 Name:	 kiosktool
 Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group:	 System Environment/Base
@@ -34,8 +34,8 @@
 
 %configure \
   --disable-rpath \
-  %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --disable-dependency-tracking }
+  --disable-debug --disable-warnings \ 
+  --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
@@ -58,29 +58,22 @@
 # empty default settings
 install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde-user-profile
 
-# Replace absolute symlinks with relative ones
-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
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML
+# 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
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
   fi
 done
 fi
@@ -112,6 +105,11 @@
 
 
 %changelog
+* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-4
+- --enable-final
+- fix symlinks
+- simplify configure
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-3
 - %%post: drop needless update-desktop-database
 - --add-category=Application




More information about the fedora-extras-commits mailing list