diff --git a/CMakeLists.txt.DSO.patch b/CMakeLists.txt.DSO.patch deleted file mode 100644 index 226b0eb..0000000 --- a/CMakeLists.txt.DSO.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/CMakeLists.txt 2010-01-09 17:30:13.000000000 +0100 -+++ src/CMakeLists.txt.old 2010-02-14 19:48:49.000000000 +0100 -@@ -46,7 +46,7 @@ - - kde4_add_executable(partitionmanager-bin ${partitionmanager-bin_SRCS}) - --target_link_libraries(partitionmanager-bin partitionmanagerprivate) -+target_link_libraries(partitionmanager-bin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS}) - - if(UNIX) - add_custom_target(partitionmanager ALL diff --git a/kde-partitionmanager.spec b/kde-partitionmanager.spec index 5aa4942..6eefaf4 100644 --- a/kde-partitionmanager.spec +++ b/kde-partitionmanager.spec @@ -11,9 +11,7 @@ URL: http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=895 Source0: http://www.kde-apps.org/CONTENT/content-files/89595-partitionmanager-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstreamable patches -# Fix DSO patches -Patch10: CMakeLists.txt.DSO.patch +# upstreamable patches BuildRequires: parted-devel, e2fsprogs-devel, pkgconfig, gettext, kdelibs4-devel, cmake %if 0%{?fedora} >= 12 @@ -44,8 +42,6 @@ mv src/partitionmanager.desktop src/kde-partitionmanager.desktop mv src/kcm/kcm_partitionmanager.desktop src/kcm/kcm_kde-partitionmanager.desktop sed -i 's,partitionmanager.desktop,kde-partitionmanager.desktop,' src/CMakeLists.txt -%patch10 -p0 - %build mkdir -p %{_target_platform} pushd %{_target_platform}