[kdesdk] 4.7.80 (beta 1)

[Radek Novacek]

commit 32a03125a6e6b910dade487d8f3d8d128a16de0c
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Fri Nov 25 08:56:55 2011 +0100

    4.7.80 (beta 1)

 .gitignore                            |    1 +
 kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch |   14 --------------
 kdesdk-4.7.0-fix-qt48-moc.patch       |   12 ------------
 kdesdk.spec                           |   20 ++++++++++----------
 sources                               |    2 +-
 5 files changed, 12 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43ecbad..e972372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdesdk-4.7.2.tar.bz2
 /kdesdk-4.7.3.tar.bz2
+/kdesdk-4.7.80.tar.bz2
diff --git a/kdesdk.spec b/kdesdk.spec
index d902c52..0d06f88 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Summary:        The KDE Software Development Kit (SDK)
-Version:        4.7.3
+Version:        4.7.80
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -9,12 +9,9 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{versio
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
-# fix big endian check/logic to not fail the build
-Patch50: kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch 
 
 ## upstream patches
-# fix qt 4.8 moc issue due to use of virtual inheritance (#725077)
-Patch100: kdesdk-4.7.0-fix-qt48-moc.patch
+
 
 # FIXME: Missing dependency on jpackage-utils and java?
 BuildRequires:  antlr-static antlr-tool jpackage-utils java >= 1.6
@@ -248,9 +245,6 @@ Requires: %{name}-common = %{version}-%{release}
 %prep
 %setup -q -n kdesdk-%{version}
 
-%patch50 -p1 -b .NO_STRUCTURES_TOOL
-%patch100 -p2 -b .fix-qt48-moc
-
 
 %build
 mkdir -p %{_target_platform}
@@ -444,8 +438,8 @@ fi
 %{_kde4_libdir}/libkomparedialogpages.so
 %{_kde4_libdir}/libkomparediff2.so
 %{_kde4_datadir}/kde4/servicetypes/kompare*.desktop
-%{_kde4_libdir}/kde4/libkomparenavtreepart.so
-%{_kde4_libdir}/kde4/libkomparepart.so
+%{_kde4_libdir}/kde4/komparenavtreepart.so
+%{_kde4_libdir}/kde4/komparepart.so
 %{_kde4_datadir}/applications/kde4/kompare.desktop
 %{_kde4_iconsdir}/hicolor/*/apps/kompare.*
 %{_kde4_datadir}/kde4/services/komparenavtreepart.desktop
@@ -683,6 +677,12 @@ fi
 
 
 %changelog
+* Fri Nov 25 2011 Radek Novacek <rnovacek at redhat.com> 4.7.80-1
+- 4.7.80 (beta 1)
+- Drop patch for fixing virtual inheritance of QObject (fixed upstream)
+- Drop patch for fixing big endian check/logic to not fail the build (fixed upstream)
+- libkomparepart.so renamed to komparepart.so (same for komparenavtreepart.so)
+
 * Sat Oct 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-1
 - 4.7.3
 - pkgconfig-style deps
diff --git a/sources b/sources
index 5da0858..7f27541 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-730fbf307793efb8dd7db2d54ae8080c  kdesdk-4.7.3.tar.bz2
+354a7c1702fd9cad8e7aeed6f6fc23b2  kdesdk-4.7.80.tar.bz2