SPECS (AC-branch): kdelibs.spec - ghost soname symlinks
glen
glen at pld-linux.org
Fri Feb 15 17:23:40 CET 2008
Author: glen Date: Fri Feb 15 16:23:39 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- ghost soname symlinks
---- Files affected:
SPECS:
kdelibs.spec (1.448.2.30 -> 1.448.2.31)
---- Diffs:
================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.448.2.30 SPECS/kdelibs.spec:1.448.2.31
--- SPECS/kdelibs.spec:1.448.2.30 Thu Feb 14 11:16:53 2008
+++ SPECS/kdelibs.spec Fri Feb 15 17:23:34 2008
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-#
# Conditional build:
%bcond_without alsa # build without ALSA support
%bcond_without apidocs # don't prepare API documentation
@@ -44,7 +43,7 @@
# http://kate-editor.org/downloads/syntax_highlighting?kateversion=2.5
Patch11: %{name}-kate-syntax.patch
URL: http://www.kde.org/
-BuildRequires: OpenEXR-devel >= 1.2.2
+BuildRequires: OpenEXR-devel >= 1.4.0.a
BuildRequires: acl-devel
%{?with_alsa:BuildRequires: alsa-lib-devel}
BuildRequires: arts-qt-devel >= %{artsver}
@@ -363,10 +362,10 @@
%patch10 -p1
%patch11 -p1
-rm -f configure
-cp /usr/share/automake/config.sub admin
+mv -f configure{,.dist}
%build
+cp /usr/share/automake/config.sub admin
export kde_htmldir=%{_kdedocdir}
export kde_libs_htmldir=%{_kdedocdir}
if [ ! -f configure ]; then
@@ -394,50 +393,57 @@
%{?with_apidocs:%{__make} apidox}
%install
-rm -rf $RPM_BUILD_ROOT
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+ rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- kde_htmldir=%{_kdedocdir}
- kde_libs_htmldir=%{_kdedocdir}
-
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/services
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
-
-install -d \
- $RPM_BUILD_ROOT/etc/security \
- $RPM_BUILD_ROOT%{_libdir}/kconf_update_bin \
- $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden \
- $RPM_BUILD_ROOT%{_datadir}/apps/khtml/kpartplugins \
- $RPM_BUILD_ROOT%{_datadir}/apps/profiles \
- $RPM_BUILD_ROOT%{_datadir}/apps/remotes \
- $RPM_BUILD_ROOT%{_datadir}/config/magic \
- $RPM_BUILD_ROOT%{_datadir}/services/kconfiguredialog \
- $RPM_BUILD_ROOT%{_iconsdir}/crystalsvg/{16x16,22x22,32x32,48x48,64x64,128x128}/apps
-
-install -d $RPM_BUILD_ROOT%{_kdedocdir}/{ca,cs,da,de,en,en_GB,es,et,fi,fr,hu,it,ja,nb,nl,pl,pt,pt_BR,ro,ru,sk,sl,sv,tr,uk,zh_TW}/common
-
-# For fileshare
-touch $RPM_BUILD_ROOT/etc/security/fileshare.conf
-%{__sed} -i -e 's|/etc/init.d|/etc/rc.d/init.d|g' $RPM_BUILD_ROOT%{_bindir}/fileshare*
-
-if [ -d $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs ] ; then
- mv -f $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-{%{version}-,}apidocs
+ %{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ kde_htmldir=%{_kdedocdir}
+ kde_libs_htmldir=%{_kdedocdir}
+ touch makeinstall.stamp
fi
-# packaged by hicolor-icon-theme
-rm $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
+if [ ! -f installed.stamp ]; then
+ install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/services
+ install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop
+ install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
+
+ install -d \
+ $RPM_BUILD_ROOT/etc/security \
+ $RPM_BUILD_ROOT%{_libdir}/kconf_update_bin \
+ $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden \
+ $RPM_BUILD_ROOT%{_datadir}/apps/khtml/kpartplugins \
+ $RPM_BUILD_ROOT%{_datadir}/apps/profiles \
+ $RPM_BUILD_ROOT%{_datadir}/apps/remotes \
+ $RPM_BUILD_ROOT%{_datadir}/config/magic \
+ $RPM_BUILD_ROOT%{_datadir}/services/kconfiguredialog \
+ $RPM_BUILD_ROOT%{_iconsdir}/crystalsvg/{16x16,22x22,32x32,48x48,64x64,128x128}/apps
+
+ install -d $RPM_BUILD_ROOT%{_kdedocdir}/{ca,cs,da,de,en,en_GB,es,et,fi,fr,hu,it,ja,nb,nl,pl,pt,pt_BR,ro,ru,sk,sl,sv,tr,uk,zh_TW}/common
+
+ # For fileshare
+ touch $RPM_BUILD_ROOT/etc/security/fileshare.conf
+ %{__sed} -i -e 's|/etc/init.d|/etc/rc.d/init.d|g' $RPM_BUILD_ROOT%{_bindir}/fileshare*
+
+ if [ -d $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs ] ; then
+ mv -f $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-{%{version}-,}apidocs
+ fi
+
+ # packaged by hicolor-icon-theme
+ rm $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
+
+ # remove *.la for dynamic plugins. kde lib loader handles .so now.
+ rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+ # keep $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidget.la for kdebase and others.
+ rm $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/styles/*.la
+ rm $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la
+
+ # remove unwanted boost deps from .la
+ sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidgets.la
+ sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la
-# remove *.la for dynamic plugins. kde lib loader handles .so now.
-rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-# keep $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidget.la for kdebase and others.
-rm $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/styles/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la
-
-# remove unwanted boost deps from .la
-sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidgets.la
-sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la
+ touch installed.stamp
+fi
%clean
rm -rf $RPM_BUILD_ROOT
@@ -767,15 +773,25 @@
%attr(755,root,root) %{_libdir}/kde3/libshellscript.so
%attr(755,root,root) %{_libdir}/kde3/wmfthumbnail.so
%attr(755,root,root) %{_libdir}/libDCOP.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libDCOP.so.4
%attr(755,root,root) %{_libdir}/libartskde.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartskde.so.1
%attr(755,root,root) %{_libdir}/libkabc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc.so.1
%attr(755,root,root) %{_libdir}/libkabc_dir.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc_dir.so.1
%attr(755,root,root) %{_libdir}/libkabc_file.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc_file.so.1
%attr(755,root,root) %{_libdir}/libkabc_ldapkio.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc_ldapkio.so.1
%attr(755,root,root) %{_libdir}/libkatepartinterfaces.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkatepartinterfaces.so.0
%attr(755,root,root) %{_libdir}/libkdecore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdecore.so.4
%attr(755,root,root) %{_libdir}/libkdefakes.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdefakes.so.4
%attr(755,root,root) %{_libdir}/libkdefx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdefx.so.4
%attr(755,root,root) %{_libdir}/libkdeinit_cupsdconf.so
%attr(755,root,root) %{_libdir}/libkdeinit_dcopserver.so
%attr(755,root,root) %{_libdir}/libkdeinit_kaddprinterwizard.so
@@ -788,34 +804,63 @@
%attr(755,root,root) %{_libdir}/libkdeinit_kio_uiserver.so
%attr(755,root,root) %{_libdir}/libkdeinit_klauncher.so
%attr(755,root,root) %{_libdir}/libkdeprint.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeprint.so.4
%attr(755,root,root) %{_libdir}/libkdeprint_management.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeprint_management.so.4
%attr(755,root,root) %{_libdir}/libkdesasl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdesasl.so.1
%attr(755,root,root) %{_libdir}/libkdesu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdesu.so.4
%attr(755,root,root) %{_libdir}/libkdeui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeui.so.4
%attr(755,root,root) %{_libdir}/libkdnssd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdnssd.so.1
%attr(755,root,root) %{_libdir}/libkhtml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkhtml.so.4
%attr(755,root,root) %{_libdir}/libkimproxy.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkimproxy.so.0
%attr(755,root,root) %{_libdir}/libkio.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkio.so.4
%attr(755,root,root) %{_libdir}/libkjava.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkjava.so.1
%attr(755,root,root) %{_libdir}/libkjs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkjs.so.1
%attr(755,root,root) %{_libdir}/libkmdi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmdi.so.1
%attr(755,root,root) %{_libdir}/libkmdi2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmdi2.so.1
%attr(755,root,root) %{_libdir}/libkmediaplayer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmediaplayer.so.0
%attr(755,root,root) %{_libdir}/libkmid.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmid.so.0
%attr(755,root,root) %{_libdir}/libknewstuff.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libknewstuff.so.1
%attr(755,root,root) %{_libdir}/libkntlm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkntlm.so.0
%attr(755,root,root) %{_libdir}/libkparts.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkparts.so.2
%attr(755,root,root) %{_libdir}/libkresources.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkresources.so.1
%attr(755,root,root) %{_libdir}/libkscreensaver.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkscreensaver.so.4
%attr(755,root,root) %{_libdir}/libkscript.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkscript.so.0
%attr(755,root,root) %{_libdir}/libkspell.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkspell.so.4
%attr(755,root,root) %{_libdir}/libkspell2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkspell2.so.1
%attr(755,root,root) %{_libdir}/libktexteditor.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libktexteditor.so.0
%attr(755,root,root) %{_libdir}/libkunittest.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkunittest.so.1
%attr(755,root,root) %{_libdir}/libkutils.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkutils.so.1
%attr(755,root,root) %{_libdir}/libkwalletbackend.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkwalletbackend.so.1
%attr(755,root,root) %{_libdir}/libkwalletclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkwalletclient.so.1
%attr(755,root,root) %{_libdir}/libvcard.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvcard.so.0
# 3rdparty directories
%dir %{_libdir}/kconf_update_bin
@@ -963,6 +1008,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.448.2.31 2008-02-15 16:23:34 glen
+- ghost soname symlinks
+
Revision 1.448.2.30 2008-02-14 10:16:53 glen
- disable branch diff when not using
@@ -1361,4 +1409,3 @@
Revision 1.380 2005/01/04 21:54:45 havner
- security pointed by Michal Kochanowicz
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdelibs.spec?r1=1.448.2.30&r2=1.448.2.31&f=u
More information about the pld-cvs-commit
mailing list