diff --git a/.cvsignore b/.cvsignore index e69de29..b7ec796 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +kdebase-workspace-3.96.1.tar.bz2 diff --git a/kdebase-workspace-3.96.0-plasma-pager.diff b/kdebase-workspace-3.96.0-plasma-pager.diff new file mode 100644 index 0000000..411d58e --- /dev/null +++ b/kdebase-workspace-3.96.0-plasma-pager.diff @@ -0,0 +1,11 @@ +diff -Naur kdebase-workspace-3.96.0/libs/plasma/corona.cpp kdebase-workspace-3.96.0.new/libs/plasma/corona.cpp +--- kdebase-workspace-3.96.0/libs/plasma/corona.cpp 2007-11-14 00:55:30.000000000 +0100 ++++ kdebase-workspace-3.96.0.new/libs/plasma/corona.cpp 2007-11-20 02:14:55.000000000 +0100 +@@ -251,6 +251,7 @@ + panel->addApplet("launcher"); + panel->addApplet("tasks"); + panel->addApplet("systemtray"); ++ panel->addApplet("pager"); + panel->addApplet("digital-clock"); + + // trigger an instant layout so we immediately have a proper geometry rather than waiting around diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec new file mode 100644 index 0000000..6764308 --- /dev/null +++ b/kdebase-workspace.spec @@ -0,0 +1,241 @@ + +# FIXME, currently incompat with nm >= 0.7 +%define _without_nm -DWITH_NetworkManager=off + +Summary: K Desktop Environment - Workspace +Name: kdebase-workspace +Version: 3.96.1 + +Release: 2%{?dist} +Source0: ftp://ftp.kde.org/pub/kde/unstable/3.96.1/src/kdebase-workspace-%{version}.tar.bz2 + +License: GPLv2 +Group: User Interface/Desktops +URL: http://www.kde.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch0: kdebase-workspace-3.96.0-plasma-pager.diff + +BuildRequires: bluez-libs-devel +BuildRequires: cmake +BuildRequires: glib2-devel +BuildRequires: kde-filesystem >= 4 +BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: libraw1394-devel +BuildRequires: libxklavier-devel +BuildRequires: libXres-devel +BuildRequires: lm_sensors-devel +%{!?_without_nm:BuildRequires: NetworkManager-devel} +BuildRequires: pam-devel +BuildRequires: qimageblitz-devel + +Requires(post): xdg-utils +Requires(postun): xdg-utils +%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} + +#Requires: kdebase-runtime >= %{version} +#Requires: oxygen-icon-theme + + +%description +The KDE Workspace consists of what is the desktop of the +KDE Desktop Environment. + +This package contains: +* kdm (the login manager of KDE) +* khotkeys (a hotkey daemon) +* klipper (a cut & paste history utility) +* kmenuedit (the menu editor) +* krandrtray (resize and rotate X screens) +* krunner (a command run interface) +* ksysguard (a performance monitor) +* kwin (the window manager of KDE) +* kxkb (a utility to switch keyboard maps) +* plasma (the KDE desktop, panels and widgets workspace application) +* systemsettings (the configuration editor) + +%package devel +Group: Development/Libraries +Summary: Development files for %{name} +Requires: %{name} = %{version}-%{release} +Requires: kdelibs4-devel +%description devel +%{summary}. + +%package libs +Summary: Runtime libraries for %{name} +Group: System Environment/Libraries +Requires: kdelibs4 >= %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%description libs +%{summary}. + + +%prep + +%setup -q +# Use for now to get a more workable desktop +%patch0 -p1 -b .plasma-pager + + +%build + +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} %{?_without_nm} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + + +%install +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} -C %{_target_platform} + +# xsession support +mkdir -p %{buildroot}%{_datadir}/xsessions/ +ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop + +# FIXME/TODO: provide kdm config in kde-settings(-kdm) +# nuke, use external kde-config-kdm +rm -rf %{buildroot}%{_kde4_configdir}/kdm + +# move devel symlinks +mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel +pushd %{buildroot}%{_kde4_libdir} +for i in lib*.so +do + case "$i" in + libkdeinit4_*.so) + ;; + # leave libworkspace.so for kate + libkworkspace.so|libplasma.so) + linktarget=`readlink "$i"` + ln -sf "../../$linktarget" "kde4/devel/$i" + ;; + *) + linktarget=`readlink "$i"` + rm -f "$i" + ln -sf "../../$linktarget" "kde4/devel/$i" + ;; + esac +done +popd + + +%clean +rm -rf %{buildroot} + +%post +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : + +%postun +xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || : +xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc COPYING README +%config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc +# FIXME/TODO: Consider %config(noreplace) +%config %{_kde4_sysconfdir}/systemsettingsrc +%{_kde4_bindir}/* +%{_kde4_appsdir}/* +%{_kde4_configdir}/* +%{_kde4_datadir}/kde4/services/* +%{_kde4_datadir}/kde4/servicetypes/* +%{_kde4_datadir}/wallpapers/* +%{_kde4_datadir}/sounds/* +%{_kde4_datadir}/desktop-directories/* +%{_kde4_datadir}/autostart/* +%{_kde4_datadir}/applications/kde4/* +%{_datadir}/dbus-1/interfaces/* +%{_kde4_datadir}/config.kcfg/* +%{_datadir}/xsessions/* +%{_kde4_docdir}/HTML/en/* +%{_kde4_iconsdir}/oxygen/*/*/* +%{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_iconsdir}/crystalsvg/*/*/* +%{_kde4_libdir}/libkdeinit4*.so +%{_kde4_libdir}/kconf_update_bin/* +%{_kde4_libdir}/kde4/* +%exclude %{_kde4_libdir}/kde4/devel/ + +%files libs +%defattr(-,root,root,-) +%{_kde4_libdir}/lib*.so.* + +%files devel +%defattr(-,root,root,-) +%{_kde4_includedir}/* +%{_kde4_libdir}/lib*.so +%{_kde4_libdir}/kde4/devel/lib*.so +%exclude %{_kde4_libdir}/libkdeinit4*.so + + +%changelog +* Wed Nov 28 2007 Rex Dieter 3.96.1-2 +- %%doc README COPYING +- -libs subpkg +- -libs: Requires: kdelibs4 +- don't remove libplasma.so from %%{_kde4_libdir} +- %%files: use %%_datadir for dbus-1/interfaces,xsessions + +* Mon Nov 19 2007 Sebastian Vahl 3.96.1-1 +- kde-3.96.1 + +* Mon Nov 19 2007 Sebastian Vahl 3.96.0-7 +- use kde.desktop from /usr/share/apps/kdm/sessions/kde.desktop +- use %%config(noreplace) for /etc/ksysguarddrc +- Requires: kdebase, kdebase-runtime, oxygen-icon-theme +- fix url + +* Mon Nov 19 2007 Sebastian Vahl 3.96.0-6 +- add patch to get pager in plasma bar +- re-added BR: libraw1394-devel + +* Mon Nov 19 2007 Sebastian Vahl 3.96.0-5 +- leave libkworkspace.so for kate +- BR: kde-filesystem >= 4 + +* Mon Nov 19 2007 Sebastian Vahl 3.96.0-4 +- BR: libXtst-devel +- BR: libXScrnSaver-devel + +* Fri Nov 15 2007 Sebastian Vahl 3.96.0-3 +- own some more directories +- add %%defattr to package devel +- some spec cleanups +- -R: kdepimlibs-devel +- +BR: libXpm-devel +- +BR: glib2-devel (do we really need this?) + +* Thu Nov 15 2007 Sebastian Vahl 3.96.0-2 +- BR: libXxf86misc-devel +- BR: libXxf86misc-devel +- BR: libXcomposite-devel +- BR: bluez-libs-devel +- BR: libxklavier-devel +- BR: pam-devel +- BR: lm_sensors-devel +- BR: libXdamage-devel +- BR: libXv-devel +- BR: libXres-devel + +* Wed Nov 14 2007 Sebastian Vahl 3.96.0-1 +- kde-3.96.0 + +* Wed Nov 14 2007 Sebastian Vahl 3.95.2-1 +- Initial version of kdebase-workspace diff --git a/sources b/sources index e69de29..2f515e5 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +510ccbe9162367ed9e4970a78162c2a8 kdebase-workspace-3.96.1.tar.bz2