|
@@ -1,17 +1,18 @@
|
|
|
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
|
|
|
|
|
+%define kdelibs_version 4.12.2
|
|
|
+
|
|
|
Name: kdebase-workspace
|
|
|
Summary: KDE Workspace
|
|
|
Summary(ja): KDE ワークスペース
|
|
|
-Version: 4.11.4
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 4.11.6
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
License: GPLv2
|
|
|
Group: User Interface/Desktops
|
|
|
URL: http://www.kde.org/
|
|
|
|
|
|
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version}.tar.xz
|
|
|
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-wallpapers-%{version}.tar.xz
|
|
|
# for Vine
|
|
|
Source101: vine_kdm_setting.tar.gz
|
|
|
Source102: kdm.pam
|
|
@@ -90,10 +91,10 @@ BuildRequires: mesa-libGLES-devel
|
|
|
BuildRequires: libudev-devel
|
|
|
BuildRequires: google-gadgets-devel >= 0.10.5
|
|
|
BuildRequires: gpsd-devel
|
|
|
-BuildRequires: kdelibs4-devel >= %{version}
|
|
|
-BuildRequires: kdepimlibs-devel >= %{version}
|
|
|
-BuildRequires: kactivities-devel >= %{version}
|
|
|
-BuildRequires: nepomuk-core-devel >= %{version}
|
|
|
+BuildRequires: kdelibs4-devel >= %{kdelibs_version}
|
|
|
+BuildRequires: kdepimlibs-devel >= %{kdelibs_version}
|
|
|
+BuildRequires: kactivities-devel >= %{kdelibs_version}
|
|
|
+BuildRequires: nepomuk-core-devel >= %{kdelibs_version}
|
|
|
BuildRequires: libdmtx-devel
|
|
|
BuildRequires: libqalculate-devel
|
|
|
BuildRequires: libraw1394-devel
|
|
@@ -132,7 +133,7 @@ BuildRequires: xz-devel
|
|
|
Requires: polkit-kde
|
|
|
|
|
|
Requires: %{name}-libs = %{version}-%{release}
|
|
|
-Requires: kdebase-runtime >= %{version}
|
|
|
+Requires: kdebase-runtime >= %{kdelibs_version}
|
|
|
|
|
|
# would much rather these deps be elsewhere,
|
|
|
# but adding here doesn't hurt either -- Rex
|
|
@@ -166,6 +167,9 @@ Conflicts: kdebase4 < 4.4.80
|
|
|
# kgreet_* plugins moved here
|
|
|
Conflicts: kdm < 4.6.90-4
|
|
|
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+
|
|
|
%description
|
|
|
The KDE Workspace consists of what is the desktop of the
|
|
|
KDE Desktop Environment.
|
|
@@ -199,7 +203,7 @@ Provides: solid-bluetooth-devel = %{version}-%{release}
|
|
|
Summary: Runtime libraries for %{name}
|
|
|
Summary(ja): %{name} のランタイムライブラリ
|
|
|
Group: System Environment/Libraries
|
|
|
-Requires: kdelibs4 >= %{version}
|
|
|
+Requires: kdelibs >= %{kdelibs_version}
|
|
|
#Requires: %{name} = %{version}-%{release}
|
|
|
Provides: solid-bluetooth = %{version}-%{release}
|
|
|
|
|
@@ -222,7 +226,7 @@ BuildArch: noarch
|
|
|
Summary: KDE wallpapers
|
|
|
Summary(ja): KDE ワークスペース用のデスクトップ壁紙集
|
|
|
Group: User Interface/Desktops
|
|
|
-Provides: kde-wallpapers = %{version}-%{release}
|
|
|
+Requires: kde-wallpapers
|
|
|
BuildArch: noarch
|
|
|
|
|
|
%description wallpapers
|
|
@@ -234,7 +238,7 @@ Summary(ja): KDE ログインマネージャ
|
|
|
Group: User Interface/X
|
|
|
Provides: kdebase-kdm = %{version}-%{release}
|
|
|
Provides: service(graphical-login) = kdm
|
|
|
-Requires: kdelibs4 >= %{version}
|
|
|
+Requires: kdelibs >= %{kdelibs_version}
|
|
|
Obsoletes: kde-settings-kdm < 4.9.12
|
|
|
|
|
|
%description -n kdm
|
|
@@ -293,13 +297,8 @@ Requires: akonadi
|
|
|
|
|
|
|
|
|
%prep
|
|
|
-%setup -q -T -c -a 0
|
|
|
-%setup -q -T -D -a 1
|
|
|
-
|
|
|
-# mimic old kdebase-workspace behaviour to match package name
|
|
|
-mv kde-workspace-%{version} %{name}-%{version}
|
|
|
-
|
|
|
-pushd %{name}-%{version}
|
|
|
+#%setup -q -T -c -a 0
|
|
|
+%setup -q -n kde-workspace-%{version}
|
|
|
|
|
|
%patch1 -p1 -b .redhat_startkde
|
|
|
# Well, I looked at doing this using the context menu plugin system and it
|
|
@@ -330,56 +329,31 @@ pushd %{name}-%{version}
|
|
|
# Vine patches
|
|
|
%patch700 -p1 -b .noxmms
|
|
|
%patch701 -p1 -b .startkde
|
|
|
-popd
|
|
|
-
|
|
|
|
|
|
%build
|
|
|
-pushd %{name}-%{version}
|
|
|
- mkdir -p %{_target_platform}
|
|
|
- pushd %{_target_platform}
|
|
|
- #unset QTDIR || : ; . /etc/profile.d/qt4.sh
|
|
|
- %cmake \
|
|
|
- -DCMAKE_BUILD_TYPE=release \
|
|
|
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
|
|
- -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
|
|
|
- -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
|
|
|
- -DLIB_INSTALL_DIR:PATH=%{_libdir} \
|
|
|
- -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
|
|
|
- -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
|
|
|
- -DKDE4_KDM_PAM_SERVICE=kdm \
|
|
|
- -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
|
|
|
- -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
|
|
|
- ..
|
|
|
- popd
|
|
|
-
|
|
|
- make -C %{_target_platform}
|
|
|
-
|
|
|
-popd
|
|
|
-
|
|
|
-pushd kde-wallpapers-%{version}
|
|
|
- mkdir -p %{_target_platform}
|
|
|
- pushd %{_target_platform}
|
|
|
- #unset QTDIR || : ; . /etc/profile.d/qt4.sh
|
|
|
- %cmake \
|
|
|
- -DCMAKE_BUILD_TYPE=release \
|
|
|
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
|
|
- -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
|
|
|
- -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
|
|
|
- -DLIB_INSTALL_DIR:PATH=%{_libdir} \
|
|
|
- -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
|
|
|
- -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
|
|
|
- ..
|
|
|
- popd
|
|
|
-
|
|
|
- make %{?_smp_mflags} -C %{_target_platform}
|
|
|
-
|
|
|
+mkdir -p %{_target_platform}
|
|
|
+pushd %{_target_platform}
|
|
|
+
|
|
|
+%cmake \
|
|
|
+ -DCMAKE_BUILD_TYPE=release \
|
|
|
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
|
|
+ -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
|
|
|
+ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
|
|
|
+ -DLIB_INSTALL_DIR:PATH=%{_libdir} \
|
|
|
+ -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
|
|
|
+ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
|
|
|
+ -DKDE4_KDM_PAM_SERVICE=kdm \
|
|
|
+ -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
|
|
|
+ -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
|
|
|
+ ..
|
|
|
popd
|
|
|
|
|
|
+make -C %{_target_platform}
|
|
|
+
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{name}-%{version}/%{_target_platform}
|
|
|
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C kde-wallpapers-%{version}/%{_target_platform}
|
|
|
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
|
|
|
|
|
|
# xsession support
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
|
|
@@ -716,6 +690,10 @@ fi
|
|
|
%{_datadir}/kde4/services/plasma-engine-akonadi.desktop
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Feb 09 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.11.6-1
|
|
|
+- new upstream release
|
|
|
+- remove Source1 (kde-wallpapers)
|
|
|
+
|
|
|
* Thu Dec 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.11.4-2
|
|
|
- rebuild with libxcb-1.10
|
|
|
|