SPECS: kdebase.spec - merge from AC-branch

Wed Oct 25 23:29:17 CEST 2006

Author: glen                         Date: Wed Oct 25 21:29:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from AC-branch

---- Files affected:
SPECS:
   kdebase.spec (1.535 -> 1.536) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.535 SPECS/kdebase.spec:1.536

--- SPECS/kdebase.spec:1.535	Thu Oct 12 22:20:09 2006
+++ SPECS/kdebase.spec	Wed Oct 25 23:29:12 2006
@@ -5,6 +5,8 @@
 #   * builting console (--with-kdm-xconsole)
 #   * afs support (--with afs)
 # - fix kerberos support (kdm segfaults)
+# - warning: Installed (but unpackaged) file(s) found:
+#   /etc/xdg/menus/kde-screensavers.menu
 
 # Conditional build:
 %bcond_without	apidocs		# Do not prepare API documentation
@@ -133,6 +135,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_xdgdatadir	%{_datadir}/desktop-directories
+# openexr detection fails
+%undefine	configure_cache
 
 %description
 This package contains KDE base system which includes:
@@ -1113,13 +1117,13 @@
 cp /usr/share/automake/config.sub admin
 %{__make} -f admin/Makefile.common cvs
 
-sed -i -e 's#krb5/##g' configure* */configure* */*.c */*/*.c
+%{__sed} -i -e 's#krb5/##g' configure* */configure* */*.c */*/*.c
 
 %build
 %if %{with apidocs}
 	if [ ! -f "%{_kdedocdir}/en/common/kde-common.css" ]; then
 		echo "ERROR: Building kdebase with apidocs requires kdelibs"
-		echo "       to be installed _without_ excluding documentation."
+		echo "	   to be installed _without_ excluding documentation."
 		exit 1
 	fi
 %endif
@@ -1298,11 +1302,62 @@
 # Omit apidocs entries
 sed -i 's/.*apidocs.*//' *.lang
 
-
 if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
 	mv -f $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-{%{version}-,}apidocs
 fi
 
+rm -f $RPM_BUILD_ROOT/etc/X11/kdm/README
+rm -f $RPM_BUILD_ROOT%{_docdir}/kdm/README
+rm -f $RPM_BUILD_ROOT%{_desktopdir}/kde/kcmkicker.desktop # see r1.328
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/keditbookmarks.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/LookNFeel/kcmtaskbar.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/LookNFeel/panel.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/LookNFeel/panel_appearance.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/WebBrowsing/smb.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/System/kappfinder.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/System/kmenuedit.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/System/kpersonalizer.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Toys/ktip.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kpager.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/fonts/override/fonts.dir
+rm -f $RPM_BUILD_ROOT%{_datadir}/apps/kdisplay/app-defaults/*.ad # dunno. not packaged
+# apparently in applnk package
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-development-translation.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-development-webdevelopment.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-development.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-editors.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-edutainment.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-games-arcade.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-games-board.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-games-card.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-games-kids.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-games-roguelikes.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-games-strategy.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-games.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-graphics.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-internet-terminal.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-internet.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-main.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-more.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-multimedia.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-office.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-science.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-system-screensavers.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-system-terminal.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-system.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-toys.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-unknown.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-utilities-accessibility.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-utilities-desktop.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-utilities-file.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-utilities-peripherals.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-utilities-pim.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-utilities-xutils.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-utilities.directory
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2159,8 +2214,6 @@
 %{_desktopdir}/kde/panel.desktop
 %{_desktopdir}/kde/panel_appearance.desktop
 %{_desktopdir}/kde/clock.desktop
-# Do not include this!
-#%{_desktopdir}/kde/kcmkicker.desktop
 %{_desktopdir}/kde/knetattach.desktop
 %{_iconsdir}/*/*/apps/clock.png
 %{_iconsdir}/*/*/apps/date.png
@@ -2769,6 +2822,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.536  2006/10/25 21:29:12  glen
+- merge from AC-branch
+
 Revision 1.535  2006/10/12 20:20:09  arekm
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.535&r2=1.536&f=u

