Outdated pretty printers for libstdc++ dropped

diff --git a/kde4-kdevelop.spec b/kde4-kdevelop.spec
index 6f762e6af3a464b02b7e58592c178e88fe1a001b..7799f8868c7027947357aa5b63816b914602c174 100644 (file)
--- a/kde4-kdevelop.spec
+++ b/kde4-kdevelop.spec
@@ -14,11 +14,12 @@ Summary(pt_BR.UTF-8):       Ambiente Integrado de Desenvolvimento para o KDE
 Summary(zh_CN.UTF-8):  KDE C/C++集成开发环境
 Name:          kde4-kdevelop
 Version:       4.5.1
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Development/Tools
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{version}/src/%{orgname}-%{version}.tar.bz2
 # Source0-md5: 9356d8faa06a027fb6854391b03ba4bd
+Patch0:                %{orgname}-drop-outdated-printers.patch
 URL:           http://www.kdevelop.org/
 BuildRequires: QtHelp-devel >= %{qtver}
 BuildRequires: QtNetwork-devel >= %{qtver}
@@ -36,6 +37,7 @@ BuildRequires:        rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.600
 BuildRequires: zlib-devel >= 1.2.0
 BuildConflicts:        star
+Requires:      libstdc++-gdb
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): shared-mime-info
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -114,6 +116,7 @@ pisaniu własnych programów wykorzystujących kdevelop.
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch0 -p1
 
 %build
 install -d build
@@ -190,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/kdevgdb/printers/gdbinit
 %{_datadir}/apps/kdevgdb/printers/qt4.py
 %{_datadir}/apps/kdevgdb/printers/kde4.py
-%{_datadir}/apps/kdevgdb/printers/libstdcxx.py
 %{_datadir}/apps/kdevokteta
 %{_datadir}/apps/plasma/plasmoids/kdevelopsessions
 %{_datadir}/apps/plasma/services/org.kde.plasma.dataengine.kdevelopsessions.operations

diff --git a/kdevelop-drop-outdated-printers.patch b/kdevelop-drop-outdated-printers.patch
new file mode 100644 (file)
index 0000000..d9aeb03
--- /dev/null
+++ b/kdevelop-drop-outdated-printers.patch
@@ -0,0 +1,20 @@
+--- kdevelop-4.5.1/debuggers/gdb/printers/gdbinit.old  2013-05-29 23:01:36.000000000 +0200
++++ kdevelop-4.5.1/debuggers/gdb/printers/gdbinit      2013-10-26 20:09:13.220314577 +0200
+@@ -8,7 +8,4 @@
+ from kde4 import register_kde4_printers
+ register_kde4_printers (None)
+ 
+-from libstdcxx import register_libstdcxx_printers
+-register_libstdcxx_printers (None)
+-
+ end
+--- kdevelop-4.5.1/debuggers/gdb/printers/CMakeLists.txt.old   2013-05-29 23:01:36.000000000 +0200
++++ kdevelop-4.5.1/debuggers/gdb/printers/CMakeLists.txt       2013-10-26 20:08:52.916980787 +0200
+@@ -2,6 +2,6 @@
+ 
+ configure_file( gdbinit ${CMAKE_CURRENT_BINARY_DIR}/gdbinit )
+ 
+-install( FILES qt4.py kde4.py libstdcxx.py
++install( FILES qt4.py kde4.py
+     ${CMAKE_CURRENT_BINARY_DIR}/gdbinit
+     DESTINATION ${DATA_INSTALL_DIR}/kdevgdb/printers )