rpms/kdebase3/devel kdebase3.spec,1.23,1.24

Than Ngo (than) fedora-extras-commits at redhat.com
Wed Jan 23 15:38:28 UTC 2008 

Author: than

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

Modified Files:
	kdebase3.spec 
Log Message:
- f9+: omit kdesu kdialog kicker kate konqueror kscreensaver \
       ksysguard kwin ksplashml khelpcenter khotkeys kxkb kdepasswd



Index: kdebase3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kdebase3.spec	16 Jan 2008 15:44:48 -0000	1.23
+++ kdebase3.spec	23 Jan 2008 15:37:49 -0000	1.24
@@ -17,7 +17,7 @@
 %endif
 
 Version: 3.5.8
-Release: 30%{?dist}.1
+Release: 31%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -320,11 +320,6 @@
 %patch202 -p4 -b .gtk212
 %patch203 -p0 -b .gcc43
 
-%if "%{name}" != "kdebase"
-# hacks to omit stuff that doesn't support DO_NOT_COMPILE
-sed -i -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' kcontrol/Makefile.am
-%endif
-
 # security fixes
 
 %if %redhatify
@@ -340,21 +335,16 @@
    make -f admin/Makefile.common cvs
 %endif
 
-
 %build
 # set some default enviroments
 unset QTDIR && . /etc/profile.d/qt.sh
 
-# HACK for rhel4
-#PATH=$PATH:/usr/X11R6/bin; export PATH
-
 %if "%{name}" != "kdebase"
-## I'm pretty sure on these -- Rex 
 export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
-## add more of these when we're ready to (potentially) break some rawhide deps -- Rex
-#export DO_NOT_COMPILE="$DO_NOT_COMPILE kate konqueror konsole kscreensaver ksysguard kwin"
-## these too?  not sure
-#export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol kdesu kdialog kicker"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE kate konqueror kscreensaver ksysguard knetattach kwin"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE kdesu kdialog kicker ksplashml khelpcenter kxkb"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi kcontrol"
+# export DO_NOT_COMPILE="$DO_NOT_COMPILE ksonsole kioslave"
 %endif
 
 %configure \
@@ -398,16 +388,14 @@
 # build mail setting tool
 %{__cxx} $CXXFLAGS -o mailsettings %{SOURCE7}
 
-
 %install
 rm -rf %{buildroot}
 
 make RUN_KAPPFINDER=no DESTDIR=%{buildroot} install
 
+%if "%{name}" == "kdebase"
 install -p -m755 mailsettings %{buildroot}%{_bindir}/
-
-# Fix up permissions on some things
-chmod 755 %{buildroot}%{_bindir}/kdesud
+%endif
 
 # Nuke man2html - we get it from man
 find %{buildroot} -name "man2html*" | xargs rm -rf
@@ -506,7 +494,7 @@
       kmenuedit konqueror konsole krandom.kss krandrtray kreadconfig ksmserver \
       ksplashsimple kstart ksysguard ksysguardd ksystraycmd ktip ktrash kwin \
       kwin_killer_helper kwin_rules_dialog kwrite kwriteconfig kxkb \
-      nspluginscan nspluginviewer startkde
+      nspluginscan nspluginviewer startkde kdeeject
 popd
 rm -f %{buildroot}%{_sysconfdir}/ksysguarddrc
 rm -f %{buildroot}%{_libdir}/kconf_update_bin/khotkeys_update
@@ -520,6 +508,7 @@
 rm -f %{buildroot}%{_datadir}/config/klipperrc
 rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc
 rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop
+
 # remove docs
 pushd %{buildroot}%{_docdir}/HTML/en/
 rm -rf kate kcontrol kdebugdialog kdesu kdm kfind khelpcenter kinfocenter \
@@ -551,7 +540,6 @@
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/ksplash.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/ktip.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kxkb.*
-# FIXME/TODO: Check if it's wise to remove the whole directory
 rm -rf %{buildroot}%{_datadir}/locale/en_US/
 rm -rf %{buildroot}%{_datadir}/locale/l10n/
 rm -rf %{buildroot}%{_datadir}/autostart/*
@@ -559,13 +547,19 @@
 rm -rf %{buildroot}%{_datadir}/templates/*
 rm -rf %{buildroot}%{_datadir}/templates/.source/*
 rm -rf %{buildroot}%{_datadir}/wallpapers/*
+rm -rf %{buildroot}%{_libdir}/kconf_update_bin
+rm -rf %{buildroot}%{_datadir}/fonts
+rm -rf %{buildroot}%{_datadir}/apps/kdm
+rm -rf %{buildroot}%{_datadir}/apps/konqueror
+rm -rf %{buildroot}%{_datadir}/apps/apps/kbookmark
+rm -rf %{buildroot}%{_datadir}/apps/ksmserver
+rm -rf %{buildroot}%{_datadir}/applnk
+rm -rf %{buildroot}/etc/xdg/menus/
 %endif
 
-
 %clean
 rm -rf %{buildroot}
 
-
 %post
 %{!?libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
@@ -713,7 +707,6 @@
 %{_bindir}/nspluginscan
 %{_bindir}/nspluginviewer
 %{_bindir}/startkde
-# these just moved out of kdebase3 -- Rex
 %{_bindir}/kcheckrunning
 %{_bindir}/kdesktop
 %{_bindir}/kdesktop_lock
@@ -723,7 +716,6 @@
 %{_bindir}/kfontview
 %{_bindir}/krootimage
 %{_bindir}/kwebdesktop
-# 
 %{_datadir}/autostart/*
 %{_datadir}/desktop-directories/*
 %{_datadir}/locale/*/entry.desktop
@@ -732,8 +724,6 @@
 %{_datadir}/templates/*
 %{_datadir}/templates/.source/*
 %{_datadir}/wallpapers/*
-%endif
-
 %config(noreplace) /etc/xdg/menus/*
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
@@ -743,46 +733,47 @@
 %{_bindir}/kasbar
 %{_bindir}/kcheckpass
 %{_bindir}/kcontrol
-%{_bindir}/kdcop
 %{_bindir}/kdeeject
-%{_bindir}/kdeprintfax
 %{_bindir}/kdesu
-%{_bindir}/kdesud
+%attr(0755,root,root) %{_bindir}/kdesud
 %{_bindir}/khc_docbookdig.pl
 %{_bindir}/khc_htdig.pl
 %{_bindir}/khc_htsearch.pl
 %{_bindir}/khc_indexbuilder
 %{_bindir}/khc_mansearch.pl
 %{_bindir}/kicker
-%{_bindir}/kio_media_mounthelper
-%{_bindir}/kio_system_documenthelper
-%{_bindir}/kjobviewer
 %{_bindir}/klocaldomainurifilterhelper
 %{_bindir}/knetattach
 %{_bindir}/kompmgr
 %{_bindir}/kpm
-%{_bindir}/kprinter
 %{_bindir}/krdb
 %{_bindir}/ksplash
 %{_bindir}/mailsettings
 %{_libdir}/libkdeinit_*.*
-%{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
-%{_datadir}/applications/*/*
 %{_datadir}/applnk/*.desktop
 %{_datadir}/applnk/*/*
 %{_datadir}/applnk/.hidden/
-%{_datadir}/apps/*
 %config(noreplace) %{_datadir}/config/*
-%{_datadir}/config.kcfg/*
 %if ! %{redhatify}
 %{_datadir}/fonts/bitmap-fonts/*
 %endif
+%{_datadir}/sounds/*
+%endif
+%{_datadir}/config.kcfg/*
+%{_bindir}/kio_media_mounthelper
+%{_bindir}/kio_system_documenthelper
+%{_bindir}/kdcop
+%{_bindir}/kdeprintfax
+%{_bindir}/kjobviewer
+%{_bindir}/kprinter
+%{_datadir}/applications/*/*
+%{_datadir}/apps/*
 %{_datadir}/icons/*color/*/*/*
 %{_datadir}/mimelnk/*/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
-%{_datadir}/sounds/*
+%{_libdir}/kde3/*
 
 %if 0%{?libs}
 %files libs
@@ -795,6 +786,7 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*.h
+%if "%{name}" == "kdebase"
 %dir %{_includedir}/kde/kate
 %{_includedir}/kde/kate/*
 %dir %{_includedir}/kde/kwin
@@ -803,11 +795,16 @@
 %{_includedir}/kde/ksgrd/*
 %dir %{_includedir}/kde/ksplash
 %{_includedir}/kde/ksplash/*
+%endif
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.*
 
 
 %changelog
+* Wed Jan 23 2008 Than Ngo <than at redhat.com> 3.5.8-31
+- f9+: omit kdesu kdialog kicker kate konqueror kscreensaver \
+       ksysguard kwin ksplashml khelpcenter khotkeys kxkb kdepasswd
+
 * Tue Jan 15 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-30.1
 - f7: fix libkdeinit_* missing dep errors

More information about the fedora-extras-commits mailing list