SHA256
1
0
forked from pool/kactivities5

osc copypac from project:KDE:Unstable:Frameworks package:kf5-kactivities revision:68

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=1
This commit is contained in:
Hrvoje Senjan 2014-02-10 21:51:11 +00:00 committed by Git OBS Bridge
commit c6f6f47a6b
7 changed files with 331 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

13
_service Normal file
View File

@ -0,0 +1,13 @@
<services>
<service name="tar_scm">
<param name="url">git://anongit.kde.org/kactivities.git</param>
<param name="scm">git</param>
<param name="revision">frameworks</param>
<param name="versionformat">4.96.0~%h</param>
</service>
<service name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version"/>
</services>

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cac51f7312e7d33575b87c071ea1c51150ef9a0404aed86a2983b15748e28dac
size 96252

View File

@ -0,0 +1,117 @@
#
# spec file for package kf5-kactivities
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define lname libKF5Activities4
Name: kactivities5
Version: 4.96.0~a00b81a
Release: 0
Summary: KDE Plasma Activities support
License: LGPL-2.0+
Group: System/GUI/KDE
Url: git://anongit.kde.org/kde-runtime.git
Source0: kactivities-%{version}.tar.xz
Patch0: kamd-rename.patch
BuildRequires: boost-devel >= 1.49.0
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: kconfig-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kdbusaddons-devel
BuildRequires: kf5-filesystem
BuildRequires: kf5umbrella
BuildRequires: ki18n-devel
BuildRequires: kservice-devel
BuildRequires: kwindowsystem-devel
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
Obsoletes: kf5-kactivities
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
%package -n %lname
Summary: Library for KDE's Plasma Activities support
Group: System/GUI/KDE
%description -n %lname
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
%package devel
Summary: KDE Base Libraries
Group: System/GUI/KDE
Requires: %lname = %{version}
Requires: cmake
Requires: extra-cmake-modules
Requires: kdbusaddons-devel
Requires: kf5umbrella
Obsoletes: kf5-kactivities-devel
%description devel
Provides the interface and basic tools for the KDE workspace.
%prep
%setup -q -n kactivities-%{version}
%patch0 -p1
%build
%if 0%{?suse_version} == 1310
%cmake_kf5 -d build -- -DKACTIVITIES_ENABLE_EXCEPTIONS=ON
%else
%cmake_kf5 -d build
%endif
%make_jobs
%install
%kf5_makeinstall -C build
%fdupes -s %{buildroot}
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_kf5_bindir}/kactivitymanagerd5
%{_kf5_qmldir}/org/
%{_kf5_plugindir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
%{_kf5_datadir}/ontology/
%files -n libKF5Activities4
%defattr(-,root,root,-)
%{_kf5_libdir}/libKF5Activities.so.*
%files devel
%defattr(-,root,root)
%{_kf5_libdir}/libKF5Activities.so
%{_kf5_libdir}/cmake/KF5Activities/
%dir %{_kf5_includedir}/*/
%{_kf5_includedir}/*/
%{_kf5_includedir}/*.h
%{_kf5_libdir}/pkgconfig/libKActivities.pc
%changelog

117
kactivities5.spec Normal file
View File

@ -0,0 +1,117 @@
#
# spec file for package kf5-kactivities
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define lname libKF5Activities4
Name: kactivities5
Version: 4.95.0~git
Release: 0
Summary: KDE Plasma Activities support
License: LGPL-2.0+
Group: System/GUI/KDE
Url: git://anongit.kde.org/kde-runtime.git
Source0: kactivities-%{version}.tar.xz
Patch0: kamd-rename.patch
BuildRequires: boost-devel >= 1.49.0
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: kconfig-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kdbusaddons-devel
BuildRequires: kf5-filesystem
BuildRequires: kf5umbrella
BuildRequires: ki18n-devel
BuildRequires: kservice-devel
BuildRequires: kwindowsystem-devel
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
Obsoletes: kf5-kactivities
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
%package -n %lname
Summary: Library for KDE's Plasma Activities support
Group: System/GUI/KDE
%description -n %lname
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
%package devel
Summary: KDE Base Libraries
Group: System/GUI/KDE
Requires: %lname = %{version}
Requires: cmake
Requires: extra-cmake-modules
Requires: kdbusaddons-devel
Requires: kf5umbrella
Obsoletes: kf5-kactivities-devel
%description devel
Provides the interface and basic tools for the KDE workspace.
%prep
%setup -q -n kactivities-%{version}
%patch0 -p1
%build
%if 0%{?suse_version} == 1310
%cmake_kf5 -d build -- -DKACTIVITIES_ENABLE_EXCEPTIONS=ON
%else
%cmake_kf5 -d build
%endif
%make_jobs
%install
%kf5_makeinstall -C build
%fdupes -s %{buildroot}
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_kf5_bindir}/kactivitymanagerd5
%{_kf5_qmldir}/org/
%{_kf5_plugindir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
%{_kf5_datadir}/ontology/
%files -n libKF5Activities4
%defattr(-,root,root,-)
%{_kf5_libdir}/libKF5Activities.so.*
%files devel
%defattr(-,root,root)
%{_kf5_libdir}/libKF5Activities.so
%{_kf5_libdir}/cmake/KF5Activities/
%dir %{_kf5_includedir}/*/
%{_kf5_includedir}/*/
%{_kf5_includedir}/*.h
%{_kf5_libdir}/pkgconfig/libKActivities.pc
%changelog

57
kamd-rename.patch Normal file
View File

@ -0,0 +1,57 @@
diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
index 57f60be..5f47fa9 100644
--- a/src/lib/core/manager_p.cpp
+++ b/src/lib/core/manager_p.cpp
@@ -101,11 +101,11 @@ Manager *Manager::self()
->property("org.kde.KActivities.core.disableAutostart")
.toBool()) {
qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon";
- QProcess::startDetached(QStringLiteral("kactivitymanagerd"));
+ QProcess::startDetached(QStringLiteral("kactivitymanagerd5"));
}
#else
- QProcess::startDetached(QStringLiteral("kactivitymanagerd"));
+ QProcess::startDetached(QStringLiteral("kactivitymanagerd5"));
#endif
}
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 348f8a3..927727b 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -71,7 +71,7 @@ target_link_libraries (activity-manager
)
set_target_properties (activity-manager
- PROPERTIES OUTPUT_NAME kactivitymanagerd
+ PROPERTIES OUTPUT_NAME kactivitymanagerd5
)
########### install application ###############
diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
index ce68a49..34e0c13 100644
--- a/src/service/files/kactivitymanagerd.desktop
+++ b/src/service/files/kactivitymanagerd.desktop
@@ -4,7 +4,7 @@ Icon=preferences-activities
X-KDE-ServiceTypes=
X-DBUS-StartupType=Unique
X-KDE-StartupNotify=false
-Exec=kactivitymanagerd
+Exec=kactivitymanagerd5
Name=Activity Manager
Name[bs]=Menadžer aktivnosti
diff --git a/tests/core/Process.cpp b/tests/core/Process.cpp
index b6279d0..4dcc8be 100644
--- a/tests/core/Process.cpp
+++ b/tests/core/Process.cpp
@@ -83,7 +83,7 @@ void Modifier::initTestCase()
// qDebug() << env;
s_process->setEnvironment(env);
- s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd"));
+ s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5"));
s_process->waitForStarted();