kdelibs 4.7.4 reloaded (aka respin from 4.7.95)

This commit is contained in:
Lukas Tinkl 2012-01-03 23:34:58 +01:00
parent 23ceb8083b
commit 72ab421514
4 changed files with 27 additions and 3 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/kdelibs-4.7.3.tar.bz2
/kdelibs-4.7.4.tar.bz2
/kdelibs-4.7.80.tar.bz2
/kdelibs-4.7.95.tar.bz2

View File

@ -0,0 +1,18 @@
diff -ur kdelibs-orig/CMakeLists.txt kdelibs-4.7.95/CMakeLists.txt
--- kdelibs-orig/CMakeLists.txt 2012-01-03 23:05:43.900097430 +0100
+++ kdelibs-4.7.95/CMakeLists.txt 2012-01-03 23:08:27.349635175 +0100
@@ -10,11 +10,11 @@
set (KDE_VERSION_MAJOR 4)
set (KDE_VERSION_MINOR 7)
-set (KDE_VERSION_RELEASE 95)
+set (KDE_VERSION_RELEASE 4)
set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
-set (KDE_VERSION_STRING "${KDE_VERSION} (4.8 RC1 (4.7.95)")
+set (KDE_VERSION_STRING "${KDE_VERSION} (4.7.4 reloaded (aka 4.7.5)")
-set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )
+set (KDE_DISTRIBUTION_TEXT "Fedora" CACHE STRING "Indicate the distribution in bug reports" )
# win32: give kde home in debug mode a different name as the release home dir because the settings and caches are different
if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")

View File

@ -23,7 +23,7 @@
Summary: KDE Libraries
Version: 4.7.4
Release: 2%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -35,7 +35,7 @@ Provides: kdelibs4 = %{version}-%{release}
License: LGPLv2+
URL: http://www.kde.org/
Group: System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.bz2
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-4.7.95%{?alphatag}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde4-macros(api) >= 2
@ -143,6 +143,7 @@ Patch201: kdelibs-4.7.3-CVE-0046.patch
## Fedora specific patches
# make forcefully hal-free build
Patch300: kdelibs-4.7.3-halectomy.patch
Patch301: kdelibs-4.7.95-respin.patch
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
# versions using the new Moving* interfaces instead
@ -335,6 +336,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# Fedora patches
%patch300 -p1 -b .halectomy
%patch301 -p1 -b .kdelibs-4-7-95-respin
%build
@ -581,6 +583,9 @@ rm -rf %{buildroot}
%changelog
* Tue Jan 03 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.7.4-3
- update kdelibs to 4.8 RC2 (branded as a 4.7.4 respin)
* Tue Dec 06 2011 Than Ngo <than@redhat.com> - 4.7.4-2
- add s390/s390x support in kjs

View File

@ -1 +1 @@
46baa210a6f5a0d6af4b7602a4b00994 kdelibs-4.7.4.tar.bz2
7efc9e7df71345b8de25988fb7094ce9 kdelibs-4.7.95.tar.bz2