rpms/kdebase-runtime/devel kdebase-runtime.spec,1.120,1.121

Lorenzo Villani arbiter at fedoraproject.org
Tue Jun 2 14:00:34 UTC 2009 

Author: arbiter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11445

Modified Files:
	kdebase-runtime.spec 
Log Message:
- Drop old Fedora < 8 conditionals



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- kdebase-runtime.spec	19 May 2009 14:40:41 -0000	1.120
+++ kdebase-runtime.spec	2 Jun 2009 14:00:04 -0000	1.121
@@ -1,22 +1,17 @@
-
-%if 0%{?fedora} < 9
-# # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%global kde3_desktop 1
-%else
-%define flags 1 
-%endif
+%define flags 1
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.85
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
@@ -30,20 +25,19 @@ Patch3:        kdebase-runtime-4.1.1-ico
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# KHelpcenter requires htdig for building search indices
-Requires: htdig
-
-Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
+Obsoletes: kdebase4-runtime < %{version}-%{release}
 
-BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# KHelpcenter requires htdig for building search indices
+Requires: htdig
 
+BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
@@ -68,10 +62,8 @@ BuildRequires: ImageMagick
 
 %description
 Core runtime for the K Desktop Environment 4.
-%if 0%{?kde3_desktop}
-This package does not include the KDE 4 versions of applications which are
-provided by KDE 3 because of file and configuration setting conflicts.
-%endif
+
+
 
 %package libs
 Summary: Runtime libraries for %{name}
@@ -81,14 +73,16 @@ Requires: %{name} = %{version}-%{release
 %description libs
 %{summary}.
 
-%package flags 
+
+
+%package flags
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch: noarch
 %endif
-%description flags 
+%description flags
 %{summary}.
 
 
@@ -121,86 +115,15 @@ ln -s %{_kde4_libexecdir}/kdesu %{buildr
 # omit hicolor index.theme, use one from hicolor-icon-theme
 rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme
 
-%if 0%{?kde3_desktop}
-# remove files which conflict with KDE 3
-rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/khelpcenter.*
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/*/*/knetattach.*
-rm -rf %{buildroot}%{_datadir}/emoticons
-rm -rf %{buildroot}%{_kde4_datadir}/locale
-rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
-rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
-rm -f %{buildroot}%{_kde4_configdir}/kshorturifilterrc
-rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
-rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
-# binaries: conflict with kdebase
-rm -f %{buildroot}%{_kde4_bindir}/drkonqi
-rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
-rm -f %{buildroot}%{_kde4_bindir}/kdebugdialog
-rm -f %{buildroot}%{_kde4_bindir}/kdeeject
-rm -f %{buildroot}%{_kde4_bindir}/kdepasswd
-rm -f %{buildroot}%{_kde4_bindir}/kdeprintfax
-rm -f %{buildroot}%{_kde4_bindir}/kdesu
-rm -f %{buildroot}%{_kde4_bindir}/kdesud
-rm -f %{buildroot}%{_kde4_bindir}/kdialog
-rm -f %{buildroot}%{_kde4_bindir}/keditbookmarks
-rm -f %{buildroot}%{_kde4_bindir}/keditfiletype
-rm -f %{buildroot}%{_kde4_bindir}/kfind
-rm -f %{buildroot}%{_kde4_bindir}/kfmclient
-rm -f %{buildroot}%{_kde4_bindir}/khc_docbookdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htdig.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_htsearch.pl
-rm -f %{buildroot}%{_kde4_bindir}/khc_indexbuilder
-rm -f %{buildroot}%{_kde4_bindir}/khelpcenter
-rm -f %{buildroot}%{_kde4_bindir}/kinfocenter
-rm -f %{buildroot}%{_kde4_bindir}/kio_media_mounthelper
-rm -f %{buildroot}%{_kde4_bindir}/kjobviewer
-rm -f %{buildroot}%{_kde4_bindir}/klocaldomainurifilterhelper
-rm -f %{buildroot}%{_kde4_bindir}/knetattach
-rm -f %{buildroot}%{_kde4_bindir}/konqueror
-rm -f %{buildroot}%{_kde4_bindir}/konsole
-rm -f %{buildroot}%{_kde4_bindir}/kprinter
-rm -f %{buildroot}%{_kde4_bindir}/kreadconfig
-rm -f %{buildroot}%{_kde4_bindir}/kstart
-rm -f %{buildroot}%{_kde4_bindir}/ktrash
-rm -f %{buildroot}%{_kde4_bindir}/kwrite
-rm -f %{buildroot}%{_kde4_bindir}/kwriteconfig
-rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
-rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
-# binaries: conflict with kdelibs
-rm -f %{buildroot}%{_kde4_bindir}/kfile
-rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
-rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
-rm -f %{buildroot}%{_kde4_bindir}/kioexec
-rm -f %{buildroot}%{_kde4_bindir}/ksvgtopng
-# binaries: conflict with kdebase-extras
-rm -f %{buildroot}%{_kde4_bindir}/kappfinder
-# do not strictly conflict, but we removed the corresponding binaries:
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kinfocenter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kjobviewer.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konqueror.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_konsole.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kprinter.so
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kwrite.so
-# we also removed the binaries for these:
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Help.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
-rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
-%else
 # remove country flags because some people/countries forbid some other
 # people/countries' flags :-(
 %{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png}
+
 # install this service for KDE 3 applications
 # NOTE: This is not a standard .desktop file, but an "almost standard" one
 #       installed into a KDE-3-specific directory, as usual for KDE 3 services,
 #       so we can't use desktop-file-install for it.
 install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
-%endif
 
 # FIXME: -devel type files, omit for now
 rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
@@ -213,30 +136,24 @@ rm -f %{buildroot}%{_kde4_appsdir}/nepom
 rm -rf %{buildroot}
 
 
-%if ! 0%{?kde3_desktop}
 %post
 touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
 
 %posttrans
-%if ! 0%{?kde3_desktop}
 gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
 update-desktop-database -q &> /dev/null ||:
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 %postun
 if [ $1 -eq 0 ] ; then
-%if ! 0%{?kde3_desktop}
-touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-%endif
-update-desktop-database -q &> /dev/null ||:
-update-mime-database %{_kde4_datadir}/mime &> /dev/null
+    touch --no-create %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_kde4_iconsdir}/crystalsvg &> /dev/null || :
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+    update-desktop-database -q &> /dev/null ||:
+    update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %post libs -p /sbin/ldconfig
@@ -266,8 +183,6 @@ fi
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 %{_mandir}/man8/*
-
-%if ! 0%{?kde3_desktop}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_sysconfdir}/xdg/menus/kde-information.menu
@@ -280,7 +195,6 @@ fi
 %{_kde4_datadir}/locale/l10n/
 %{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
-%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -299,6 +213,9 @@ fi
 
 
 %changelog
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.85-3
+- Drop old Fedora < 8 conditionals
+
 * Tue May 19 2009 Than Ngo <than at redhat.com> - 4.2.85-2
 - file conflicts with kdepim
 
@@ -347,7 +264,7 @@ fi
 - respun tarball
 
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
-- Files not trashed to the correct location in Dolphin/Konqueror 
+- Files not trashed to the correct location in Dolphin/Konqueror
   (#481598, kdebug#178479)
 - omit --with-samba crud

More information about the fedora-extras-commits mailing list