* Mon Jul 24 2006 Petr Rockai <prockai@redhat.com> - 6:3.5.4-0.pre1

- prerelease of 3.5.4 (from the first-cut tag)
- reverted the gcc 4.1.1-8 patch, since gcc was fixed in the meantime
This commit is contained in:
prockai 2006-07-24 11:17:51 +00:00
parent 32765fcaf6
commit 7c0ea432ea
1 changed files with 29 additions and 22 deletions

View File

@ -16,8 +16,8 @@
%define make_cvs 0
%define arts 1
Version: 3.5.3
Release: 11%{?dist}
Version: 3.5.4
Release: 0.pre1%{?dist}
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@ -26,11 +26,13 @@ Group: System Environment/Libraries
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
# 3.5.3 temporarily, since we are at 3.5.4 but through patches
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
Source1: kde.sh
Source2: kde.csh
Source3: devices.protocol
Patch0: kdelibs-3.5.3-to-3.5.4.patch
Patch1: kdelibs-3.5.1-xdg-menu.patch
Patch2: kdelibs-3.0.0-ndebug.patch
Patch4: kdelibs-3.0.4-ksyscoca.patch
@ -173,7 +175,8 @@ format for easy browsing
%prep
%setup -q
%setup -q -n %{name}-3.5.3
%patch0 -p0 -b .kde3.5.4
%patch1 -p1 -b .xdg-menu
%if %{debug} == 0
%patch2 -p1 -b .debug
@ -191,26 +194,26 @@ format for easy browsing
%patch35 -p1 -b .inttype
%patch37 -p1 -b .kdebug-kmail-quiet
%patch38 -p1 -b .cupsdconf2-group
%patch39 -p1 -b .gcc-4.1.1-8
#%patch39 -p1 -b .gcc-4.1.1-8
# upstream patches
%patch100 -p1 -b .konqueror-khtml
%patch101 -p1 -b .khtml-regression
%patch102 -p0 -b .return-check
%patch103 -p0 -b .kde#57159
%patch104 -p0 -b .kde#118277
%patch105 -p0 -b .kde#123315
%patch106 -p0 -b .kde#65546
%patch107 -p0 -b .kde#128842
%patch108 -p0 -b .kde#128902
%patch109 -p0 -b .kde#67849
%patch110 -p0 -b .kde#81806
%patch111 -p0 -b .kde#128760
%patch112 -p0 -b .kde#130252
%patch113 -p0 -b .kde#106795
%patch114 -p0 -b .kde#130605
%patch115 -p0 -b .kde#129187
%patch116 -p0 -b .kde#116092
#%patch100 -p1 -b .konqueror-khtml
#%patch101 -p1 -b .khtml-regression
#%patch102 -p0 -b .return-check
#%patch103 -p0 -b .kde#57159
#%patch104 -p0 -b .kde#118277
#%patch105 -p0 -b .kde#123315
#%patch106 -p0 -b .kde#65546
#%patch107 -p0 -b .kde#128842
#%patch108 -p0 -b .kde#128902
#%patch109 -p0 -b .kde#67849
#%patch110 -p0 -b .kde#81806
#%patch111 -p0 -b .kde#128760
#%patch112 -p0 -b .kde#130252
#%patch113 -p0 -b .kde#106795
#%patch114 -p0 -b .kde#130605
#%patch115 -p0 -b .kde#129187
#%patch116 -p0 -b .kde#116092
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
@ -435,6 +438,10 @@ fi
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
* Mon Jul 24 2006 Petr Rockai <prockai@redhat.com> - 6:3.5.4-0.pre1
- prerelease of 3.5.4 (from the first-cut tag)
- reverted the gcc 4.1.1-8 patch, since gcc was fixed in the meantime
* Thu Jul 20 2006 Than Ngo <than@redhat.com> 6:3.5.3-11
- apply upstream patches,
fix kde#130831, remember when the last replacement string was the empty string