rpms/kickpim/devel kickpim.spec,1.11,1.12
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Nov 10 19:02:43 UTC 2005
Author: rdieter
Update of /cvs/extras/rpms/kickpim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13004
Modified Files:
kickpim.spec
Log Message:
- fix relative symlinks
- simplify configure
Index: kickpim.spec
===================================================================
RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kickpim.spec 4 Nov 2005 17:54:11 -0000 1.11
+++ kickpim.spec 10 Nov 2005 19:02:41 -0000 1.12
@@ -43,8 +43,8 @@
%configure \
--disable-rpath \
- %{?debug: --enable-debug --enable-warnings } \
- %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
+ --disable-debug --disable-warnings --disable-dependency-tracking \
+ --enable-final
make %{?_smp_mflags}
@@ -55,30 +55,23 @@
make install 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
-# 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
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+ 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
@@ -100,6 +93,8 @@
* Fri Nov 04 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.3-9
- drop useless macros
- drop redundant %%doc
+- fix relative symlinks
+- simplify configure
* 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)
More information about the scm-commits
mailing list