rpms/kdebase/devel kdebase.spec,1.379,1.380
Lorenzo Villani
arbiter at fedoraproject.org
Tue Jun 2 13:50:31 UTC 2009
Author: arbiter
Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8072
Modified Files:
kdebase.spec
Log Message:
- Fedora 8 is EOL'ed, drop conditionals and cleanup the specfile
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -p -r1.379 -r1.380
--- kdebase.spec 19 May 2009 13:46:31 -0000 1.379
+++ kdebase.spec 2 Jun 2009 13:50:29 -0000 1.380
@@ -1,52 +1,32 @@
+Name: kdebase
Summary: K Desktop Environment 4 - Core Files
Version: 4.2.85
-Release: 1%{?dist}
-
-%if 0%{?fedora} > 8
-Name: kdebase
+Release: 2%{?dist}
Epoch: 6
-Obsoletes: kdebase4 < %{version}-%{release}
-Provides: kdebase4 = %{version}-%{release}
-
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-
-# make -libs subpkg
-%define libs 1
-
-%else
-Name: kdebase4
-%endif
-
License: GPLv2
Group: User Interface/Desktops
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+
Patch0: kdebase-4.1.80-nsplugins-paths.patch
Patch1: kdebase-4.1.70-konsole-session.patch
Patch2: kdebase-4.2.1-home-icon.patch
-# upstream patches
-
%ifnarch s390 s390x
Requires: eject
%endif
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
+Provides: dolphin = 1.0.2-1
+Provides: kdebase4 = %{version}-%{release}
+Obsoletes: dolphin < 1.0.2-1
+Obsoletes: d3lphin
+Obsoletes: kdebase4 < %{version}-%{release}
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: dolphin = 1.0.2-1
-Obsoletes: dolphin < 1.0.2-1
-Obsoletes: d3lphin
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
# FIXME: remove BRs which are only needed for stuff now in -runtime
BuildRequires: alsa-lib-devel
@@ -62,9 +42,7 @@ BuildRequires: pcre-devel
BuildRequires: kdebase-workspace-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
-%if "%{name}" == "kdebase"
BuildRequires: plasma-devel >= %{version}
-%endif
%ifnarch s390 s390x
BuildRequires: libraw1394-devel
BuildRequires: libusb-devel
@@ -93,33 +71,30 @@ Requires: kdebase-runtime
%description
Core runtime requirements and applications for the K Desktop Environment 4.
-%if "%{name}" == "kdebase4"
-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
-%if 0%{?libs}
+
+
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
%description libs
%{summary}.
-%endif
+
+
%package devel
Group: Development/Libraries
Summary: Development files for %{name}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "kdebase4"
-Obsoletes: kdebase4-devel < %{version}-%{release}
Provides: kdebase4-devel = %{version}-%{release}
-%endif
+Obsoletes: kdebase4-devel < %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdelibs4-devel kdepimlibs4-devel
%description devel
%{summary}.
+
%prep
%setup -q -n kdebase-%{version}
%patch0 -p1 -b .nsplugins-paths
@@ -130,6 +105,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
+
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@@ -143,84 +119,6 @@ make %{?_smp_mflags} -C %{_target_platfo
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%if "%{name}" != "kdebase"
-# remove files which conflict with KDE 3
-# FIXME: remove the rm commands for stuff which isn't there to remove in the first place so we see what actually still conflicts
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
-rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
-rm -rf %{buildroot}%{_datadir}/emoticons
-rm -rf %{buildroot}%{_kde4_datadir}/locale
-rm -rf %{buildroot}%{_kde4_datadir}/autostart
-rm -rf %{buildroot}%{_kde4_sysconfdir}/xdg/menus
-rm -rf %{buildroot}%{_kde4_datadir}/desktop-directories
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/k*
-rm -rf %{buildroot}%{_kde4_datadir}/config
-rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
-rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
-rm -rf %{buildroot}%{_kde4_datadir}/templates
-# 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}/kcmshell
-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_kcmshell.so
-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
-# and this doesn't work with KDE 3 konsole
-rm -f %{buildroot}%{_kde4_bindir}/konsoleprofile
-%endif
-
# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
@@ -237,47 +135,38 @@ do
esac
done
popd
-
-%if "%{name}" == "kdebase"
# konquerorsu only show in KDE
echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop
-%endif
+
+
%clean
rm -rf %{buildroot}
+
%post
%{!?libs:/sbin/ldconfig}
-%if "%{name}" == "kdebase"
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
%posttrans
-%if "%{name}" == "kdebase"
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
update-desktop-database -q &> /dev/null ||:
%postun
%{!?libs:/sbin/ldconfig}
if [ $1 -eq 0 ] ; then
-%if "%{name}" == "kdebase"
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-%endif
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-update-desktop-database -q &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+ update-desktop-database -q &> /dev/null ||:
fi
-%if 0%{?libs}
%post libs -p /sbin/ldconfig
-
%postun libs -p /sbin/ldconfig
-%endif
%files
@@ -294,7 +183,6 @@ fi
%{_kde4_libdir}/kde4/*
%exclude %{_kde4_libdir}/kde4/devel/
%{_mandir}/man1/*
-%if "%{name}" == "kdebase"
%{_kde4_datadir}/autostart/*
%{_kde4_configdir}/*
%{_kde4_datadir}/templates/*
@@ -302,12 +190,9 @@ fi
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/libkonsoleprivate.so
-%endif
-%if 0%{?libs}
%files libs
%defattr(-,root,root,-)
-%endif
%{_kde4_libdir}/lib*.so.*
%files devel
@@ -317,6 +202,9 @@ fi
%changelog
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.2.85-2
+- Fedora 8 is EOL'ed, drop conditionals and cleanup the specfile
+
* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
- KDE 4.3 beta 1
More information about the fedora-extras-commits
mailing list