This commit is contained in:
parent
4afe33813d
commit
1d76eba66b
@ -1,12 +0,0 @@
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -11,9 +11,6 @@ add_definitions (-mmmx)
|
||||
include_directories ( ${KDE4_INCLUDES} ${BLITZ_INCLUDES} )
|
||||
ADD_SUBDIRECTORY( icons )
|
||||
ADD_SUBDIRECTORY( src )
|
||||
-if (PLASMA_FOUND)
|
||||
- ADD_SUBDIRECTORY( plasma )
|
||||
-endif (PLASMA_FOUND)
|
||||
find_package(Msgfmt REQUIRED)
|
||||
find_package(Gettext REQUIRED)
|
||||
add_subdirectory( po )
|
@ -1,9 +0,0 @@
|
||||
--- ./CMakeLists.txt 2008/10/13 12:57:51 1.3
|
||||
+++ ./CMakeLists.txt 2008/10/13 12:58:40
|
||||
@@ -17,5 +17,5 @@
|
||||
find_package(Msgfmt REQUIRED)
|
||||
find_package(Gettext REQUIRED)
|
||||
add_subdirectory( po )
|
||||
-add_subdirectory( doc-translations )
|
||||
+#add_subdirectory( doc-translations )
|
||||
add_subdirectory( doc )
|
44
rsibreak-0.9.0.diff
Normal file
44
rsibreak-0.9.0.diff
Normal file
@ -0,0 +1,44 @@
|
||||
--- rsibreak-0.9.0.orig//CMakeLists.txt 2008-11-19 20:04:03.000000000 +0000
|
||||
+++ rsibreak-0.9.0/CMakeLists.txt 2009-01-17 19:42:41.000000000 +0000
|
||||
@@ -3,19 +3,12 @@
|
||||
|
||||
find_package (KDE4 REQUIRED)
|
||||
include(KDE4Defaults)
|
||||
-macro_optional_find_package(Plasma)
|
||||
-
|
||||
-macro_log_feature(PLASMA_FOUND "Plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Plasma is needed for Plasma applet of rsibreak. Install kdebase-workspace.")
|
||||
-
|
||||
-
|
||||
|
||||
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
|
||||
include_directories ( ${KDE4_INCLUDES} ${BLITZ_INCLUDES} )
|
||||
ADD_SUBDIRECTORY( icons )
|
||||
ADD_SUBDIRECTORY( src )
|
||||
-if (PLASMA_FOUND)
|
||||
- ADD_SUBDIRECTORY( plasma )
|
||||
-endif (PLASMA_FOUND)
|
||||
+ADD_SUBDIRECTORY( plasma )
|
||||
find_package(Msgfmt REQUIRED)
|
||||
find_package(Gettext REQUIRED)
|
||||
add_subdirectory( po )
|
||||
--- rsibreak-0.9.0.orig//plasma/CMakeLists.txt 2008-11-19 19:56:00.000000000 +0000
|
||||
+++ rsibreak-0.9.0/plasma/CMakeLists.txt 2009-01-17 19:46:45.000000000 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
rsibreak_interface)
|
||||
|
||||
kde4_add_plugin(plasma_engine_rsibreak ${rsibreak_engine_SRCS})
|
||||
-target_link_libraries(plasma_engine_rsibreak ${PLASMA_LIBS} ${KDE4_KIO_LIBS})
|
||||
+target_link_libraries(plasma_engine_rsibreak ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
|
||||
|
||||
install(TARGETS plasma_engine_rsibreak DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
install(FILES plasma-engine-rsibreak.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
@@ -17,7 +17,7 @@
|
||||
rsibreak.cpp)
|
||||
|
||||
kde4_add_plugin(plasma_applet_rsibreak ${rsibreak_applet_SRCS})
|
||||
-target_link_libraries(plasma_applet_rsibreak ${PLASMA_LIBS} ${KDE4_KIO_LIBS})
|
||||
+target_link_libraries(plasma_applet_rsibreak ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
|
||||
|
||||
install(TARGETS plasma_applet_rsibreak DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
install(FILES plasma-applet-rsibreak.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 17 20:50:15 CET 2009 - coolo@suse.de
|
||||
|
||||
- fix build with plasma from 4.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 9 19:22:49 CET 2008 - stbinner@suse.de
|
||||
|
||||
- drop obsolete patches to install Plasma applet and documentation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 28 09:36:47 CET 2008 - stbinner@suse.de
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package rsibreak (Version 0.9.0)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 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
|
||||
@ -26,11 +26,10 @@ Group: Productivity/Other
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Summary: Assists in the Recovery and Prevention of Repetitive Strain Injury
|
||||
Version: 0.9.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
%define tar_version 0.9.0
|
||||
Source: rsibreak-%tar_version.tar.bz2
|
||||
Patch0: disable-plasma-dep.diff
|
||||
Patch1: fix-build.diff
|
||||
Patch0: rsibreak-%tar_version.diff
|
||||
Provides: kde4-rsibreak = 0.9.0
|
||||
Obsoletes: kde4-rsibreak <= 0.9.0
|
||||
%kde4_runtime_requires
|
||||
@ -49,8 +48,7 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -n rsibreak-%tar_version -q
|
||||
%patch0
|
||||
%patch1
|
||||
%patch -p1
|
||||
|
||||
%build
|
||||
%cmake_kde4 -d build
|
||||
@ -62,6 +60,10 @@ Authors:
|
||||
cd ..
|
||||
%suse_update_desktop_file -G "RSI Prevention" rsibreak TimeUtility
|
||||
%find_lang %name --all-name
|
||||
mkdir $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/et/common
|
||||
mkdir $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/pt/common
|
||||
mkdir $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/sv/common
|
||||
mkdir $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/uk/common
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
@ -82,8 +84,21 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/usr/share/icons/hicolor/*x*/actions/rsibreak*.png
|
||||
/usr/share/icons/hicolor/*x*/apps/rsibreak.png
|
||||
/usr/share/autostart/rsibreak.desktop
|
||||
/usr/%_lib/kde4/plasma_applet_rsibreak.so
|
||||
/usr/%_lib/kde4/plasma_engine_rsibreak.so
|
||||
/usr/share/kde4/apps/desktoptheme/default/widgets/rsibreak.svg
|
||||
/usr/share/kde4/services/plasma-applet-rsibreak.desktop
|
||||
/usr/share/kde4/services/plasma-engine-rsibreak.desktop
|
||||
%dir /usr/share/doc/kde/HTML/et
|
||||
%dir /usr/share/doc/kde/HTML/pt
|
||||
%dir /usr/share/doc/kde/HTML/sv
|
||||
%dir /usr/share/doc/kde/HTML/uk
|
||||
|
||||
%changelog
|
||||
* Sat Jan 17 2009 coolo@suse.de
|
||||
- fix build with plasma from 4.2
|
||||
* Tue Dec 09 2008 stbinner@suse.de
|
||||
- drop obsolete patches to install Plasma applet and documentation
|
||||
* Fri Nov 28 2008 stbinner@suse.de
|
||||
- update to 0.9.0 final: only version bump and translation updates
|
||||
* Sun Nov 09 2008 stbinner@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user