* Mon Feb 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-2
- no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun
This commit is contained in:
parent
fdd0c65722
commit
92ad76807f
16
kdelibs-4.3.98-no_rpath.patch
Normal file
16
kdelibs-4.3.98-no_rpath.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpaths kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
|
||||||
|
--- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpaths 2010-02-01 13:47:32.891702874 -0600
|
||||||
|
+++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake 2010-02-01 13:49:06.814704269 -0600
|
||||||
|
@@ -947,10 +947,10 @@ if (UNIX)
|
||||||
|
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
|
||||||
|
else (APPLE)
|
||||||
|
# add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
|
||||||
|
- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
|
||||||
|
+ # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
|
||||||
|
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||||
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||||
|
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||||
|
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
|
||||||
|
endif (APPLE)
|
||||||
|
endif (UNIX)
|
||||||
|
|
11
kdelibs.spec
11
kdelibs.spec
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.3.98
|
Version: 4.3.98
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -82,6 +82,11 @@ Patch24: kdelibs-4.3.1-drkonq.patch
|
|||||||
# workaound for low-mem systems (ppc64), tracking here (for now),
|
# workaound for low-mem systems (ppc64), tracking here (for now),
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=539697
|
# https://bugzilla.redhat.com/show_bug.cgi?id=539697
|
||||||
Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
|
Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
|
||||||
|
# die rpath die, since we're using standard paths, we can avoid
|
||||||
|
# this extra hassle (even though cmake is *supposed* to not add standard
|
||||||
|
# paths (like /usr/lib64) already! With this, we can drop
|
||||||
|
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
||||||
|
Patch27: kdelibs-4.3.98-no_rpath.patch
|
||||||
|
|
||||||
# upstreamable
|
# upstreamable
|
||||||
|
|
||||||
@ -232,6 +237,7 @@ format for easy browsing.
|
|||||||
%if 0%{?fedora} > 11
|
%if 0%{?fedora} > 11
|
||||||
%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
|
%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
|
||||||
%endif
|
%endif
|
||||||
|
%patch27 -p1 -b .no_rpath
|
||||||
|
|
||||||
# upstreamable patches
|
# upstreamable patches
|
||||||
|
|
||||||
@ -446,6 +452,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-2
|
||||||
|
- no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun
|
||||||
|
|
||||||
* Sun Jan 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-1
|
* Sun Jan 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-1
|
||||||
- KDE 4.3.98 (4.4rc3)
|
- KDE 4.3.98 (4.4rc3)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user