From 35fe623fe170bbcd5ac56376877058e0ea0fc407 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Feb 26 2010 20:01:53 +0000
Subject: - kdevelop-3.5.5 (#530391)


---

diff --git a/.cvsignore b/.cvsignore
index 68bc98a..89d5b61 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 kdevelop-3.5.3.tar.bz2
+kdevelop_3.5.5.orig.tar.gz
diff --git a/kdevelop.spec b/kdevelop.spec
index dd2b336..b2dd166 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -11,23 +11,19 @@
 
 %define make_cvs 1
 
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
-
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 3.5.4
-Release: 3%{?dist}
+Version: 3.5.5
+Release: 1%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/ide/%{name}-%{version}.tar.bz2
+#Source: ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/ide/%{name}-%{version}.tar.bz2
+Source0: http://download.opensuse.org/repositories/home:/amilcarlucas/xUbuntu_9.04/kdevelop_%{version}.orig.tar.gz
 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 
 Patch1: c_cpp_reference-2.0.2-config.patch
@@ -40,17 +36,11 @@ Patch4: kdevelop-3.5.2-kde4template.patch
 
 Provides: kdevelop3 = %{version}-%{release}
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
-
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires: kdelibs3-devel >= %{kde_version}
+# embedded konsole (#507653)
+Requires: kdebase3
 Requires: make
 Requires: perl
 Requires: automake libtool 
@@ -122,23 +112,21 @@ individual needs.
 Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdevelop3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs3-devel
 %description devel
 %{summary}.
 
-%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: kdelibs3 >= %{version}
 # helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdevelop < 9:3.5.4-6
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
 %{summary}.
-%endif
 
 
 
@@ -151,6 +139,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %patch4 -p1 -b .kde4template
 
 %if %{make_cvs}
+# hack/fix for newer automake
+  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
   rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
   cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
@@ -201,7 +191,6 @@ rm -rf %{buildroot}%{_prefix}/kdevbdb
 
 
 %post
-%{!?libs:/sbin/ldconfig}
 for f in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -209,18 +198,15 @@ done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-%{!?libs:/sbin/ldconfig}
 for f in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 
 %clean
@@ -244,10 +230,8 @@ rm -rf %{buildroot}
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
@@ -258,6 +242,19 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 26 2010 Rex Dieter <rdieter@fedoraproject.org> 9:3.5.5-1
+- kdevelop-3.5.5 (#530391)
+
+* Sat Sep 12 2009 Rex Dieter <rdieter@fedoraproject.org> 9:3.5.4-6
+- make -libs unconditional
+- Requires: kdebase3 (#507653)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9:3.5.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 9:3.5.4-4
+- FTBFS kdevelop-3.5.4-3.fc11 (#511768)
+
 * Mon Mar 02 2009 Than Ngo <than@redhat.com> - 3.5.4-3
 - fix build problem with gcc-4.4
 
diff --git a/sources b/sources
index d88f8f0..bed11a8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-06aa12a89b2c09968a92e1d8b575819c  kdevelop-3.5.4.tar.bz2
+76df6a0383d92c1a8d8cfcf278abb554  kdevelop_3.5.5.orig.tar.gz