[kdbg] 2.5.1

[Than Ngo]

commit 284210d879df978488e4c7d13d6353f1a5eaf7b7
Author: Than Ngo <than at redhat.com>
Date:   Wed Jan 25 11:30:41 2012 +0100

    2.5.1

 .gitignore             |    1 +
 kdbg-2.1.0-gcc44.patch |   53 ----------------------------------------------
 kdbg-2.5.1-icons.patch |    9 +++++++
 kdbg.spec              |   55 ++++++++++++++++++++++++++++++++++--------------
 sources                |    2 +-
 5 files changed, 50 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fa2b32..81c23a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ kdbg-2.0.2.tar.gz
 kdbg-2.0.5.tar.gz
 kdbg-2.1.0.tar.gz
 kdbg-2.1.1.tar.gz
+/kdbg-2.5.1.tar.gz
diff --git a/kdbg-2.5.1-icons.patch b/kdbg-2.5.1-icons.patch
new file mode 100644
index 0000000..dde4b02
--- /dev/null
+++ b/kdbg-2.5.1-icons.patch
@@ -0,0 +1,9 @@
+diff -up kdbg-2.5.1/kdbg/pics/CMakeLists.txt.me kdbg-2.5.1/kdbg/pics/CMakeLists.txt
+--- kdbg-2.5.1/kdbg/pics/CMakeLists.txt.me	2012-01-25 11:12:46.000000000 +0100
++++ kdbg-2.5.1/kdbg/pics/CMakeLists.txt	2012-01-25 11:13:19.000000000 +0100
+@@ -13,4 +13,4 @@ set(PICTOGRAMS
+ 
+ install(FILES ${PICTOGRAMS} DESTINATION "${DATA_INSTALL_DIR}/kdbg/pics")
+ 
+-kde4_install_icons("${DATA_INSTALL_DIR}/kdbg/icons")
++kde4_install_icons( ${ICON_INSTALL_DIR} )
diff --git a/kdbg.spec b/kdbg.spec
index 95fa680..e2b0f36 100644
--- a/kdbg.spec
+++ b/kdbg.spec
@@ -1,7 +1,7 @@
 Name: kdbg
 Summary: A GUI for gdb, the GNU debugger, and KDE
-Version: 2.1.1
-Release: 5%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
 Epoch: 1
 Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz
 # No version specified.
@@ -9,11 +9,11 @@ License: GPL+
 URL: http://www.kdbg.org/
 Group: Development/Debuggers
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kdbg-2.1.0-gcc44.patch
+Patch0: kdbg-2.5.1-icons.patch
 
 Requires: gdb
 
-BuildRequires: kdelibs3-devel
+BuildRequires: kdelibs-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -24,19 +24,27 @@ requires X and KDE to be installed in order to run.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
+
+%patch0 -p1 -b .icons
 
 %build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
+# don't install icons, which are included in oxygen-icon-theme
+rm -f kdbg/pics/*action-debug-run*
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
 
-%configure --disable-rpath
+%{cmake_kde4} \
+  -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" \
+  ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name}
 
@@ -44,26 +52,41 @@ make DESTDIR=$RPM_BUILD_ROOT install
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/locolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+
+touch --no-create %{_datadir}/icons/oxygen ||:
+gtk-update-icon-cache -q %{_datadir}/icons/oxygen 2> /dev/null ||:
+
 %postun
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/locolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+
+touch --no-create %{_datadir}/icons/oxygen ||:
+gtk-update-icon-cache -q %{_datadir}/icons/oxygen 2> /dev/null ||:
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%doc BUGS ChangeLog COPYING README TODO
+%doc BUGS ChangeLog* COPYING README TODO
 %defattr(-,root,root)
-%{_bindir}/*
-%{_datadir}/applications/kde/*
-%{_datadir}/apps/%{name}
-%{_datadir}/icons/*/*/*/*
+%{_kde4_bindir}/*
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_appsdir}/%{name}
+%{_kde4_iconsdir}/*/*/*/*
 %lang(de) %{_docdir}/HTML/de/%{name}
 %lang(ru) %{_docdir}/HTML/ru/%{name}
 %{_docdir}/HTML/en/%{name}
-%config (noreplace) %{_datadir}/config/kdbgrc
+%config (noreplace) %{_kde4_datadir}/config/kdbgrc
 
 %changelog
+* Tue Jan 24 2012 Than Ngo <than at redhat.com> - 2.5.1-1
+- 2.5.1
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 3521a9c..d9c3831 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b7998528a68d09ff871925335092a1e  kdbg-2.1.1.tar.gz
+a19095dce4cb5df0dbaa9368d400fc30  kdbg-2.5.1.tar.gz