rebuilt
This commit is contained in:
parent
0d78cf3926
commit
b1fabb9cb7
|
@ -11,3 +11,4 @@ kdelibs-3.5.0.tar.bz2
|
||||||
kdelibs-3.5.1.tar.bz2
|
kdelibs-3.5.1.tar.bz2
|
||||||
kdelibs-3.5.2.tar.bz2
|
kdelibs-3.5.2.tar.bz2
|
||||||
kdelibs-3.5.3.tar.bz2
|
kdelibs-3.5.3.tar.bz2
|
||||||
|
kdelibs-3.5.4.tar.bz2
|
||||||
|
|
55
kdelibs.spec
55
kdelibs.spec
|
@ -8,7 +8,7 @@
|
||||||
%define cups_epoch 1
|
%define cups_epoch 1
|
||||||
|
|
||||||
%define qt_version 3.3.6
|
%define qt_version 3.3.6
|
||||||
%define arts_version 1.5.3
|
%define arts_version 1.5.4
|
||||||
%define kde_major_version 3
|
%define kde_major_version 3
|
||||||
|
|
||||||
%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
|
%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
%define arts 1
|
%define arts 1
|
||||||
|
|
||||||
Version: 3.5.4
|
Version: 3.5.4
|
||||||
Release: 0.pre2%{?dist}
|
Release: 1{?dist}
|
||||||
Summary: K Desktop Environment - Libraries
|
Summary: K Desktop Environment - Libraries
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Url: http://www.kde.org/
|
Url: http://www.kde.org/
|
||||||
|
@ -25,14 +25,11 @@ Epoch: 6
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: LGPL
|
License: LGPL
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
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
|
Source1: kde.sh
|
||||||
Source2: kde.csh
|
Source2: kde.csh
|
||||||
Source3: devices.protocol
|
Source3: devices.protocol
|
||||||
|
|
||||||
Patch0: kdelibs-3.5.3-to-3.5.4.patch
|
|
||||||
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
||||||
Patch2: kdelibs-3.0.0-ndebug.patch
|
Patch2: kdelibs-3.0.0-ndebug.patch
|
||||||
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
||||||
|
@ -48,26 +45,6 @@ Patch34: kdelibs-3.4.0-qtdoc.patch
|
||||||
Patch35: kdelibs-3.4.92-inttype.patch
|
Patch35: kdelibs-3.4.92-inttype.patch
|
||||||
Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
|
Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
|
||||||
Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
|
Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
|
||||||
Patch39: kdelibs-3.5.3-gcc-4.1.1-8.patch
|
|
||||||
|
|
||||||
# upstream patches
|
|
||||||
Patch100: kdelibs-3.5.3-konqueror-khtml.patch
|
|
||||||
Patch101: kdelibs-3.5.3-khtml-regression.patch
|
|
||||||
Patch102: kdelibs-3.5.3.diff
|
|
||||||
Patch103: kdelibs-3.5.3-kde#57159.patch
|
|
||||||
Patch104: kdelibs-3.5.3-kde#118277.patch
|
|
||||||
Patch105: kdelibs-3.5.3-kde#123315.patch
|
|
||||||
Patch106: kdelibs-3.5.3-kde#65546.patch
|
|
||||||
Patch107: kdelibs-3.5.3-kde#128842.patch
|
|
||||||
Patch108: kdelibs-3.5.3-kde#128902.patch
|
|
||||||
Patch109: kdelibs-3.5.3-kde#67849.patch
|
|
||||||
Patch110: kdelibs-3.5.3-kde#81806.patch
|
|
||||||
Patch111: kdelibs-3.5.3-kde#128760.patch
|
|
||||||
Patch112: kdelibs-3.5.3-kde#123307.patch
|
|
||||||
Patch113: kdelibs-3.5.3-kde#106795.patch
|
|
||||||
Patch114: kdelibs-3.5.3-kde#130605.patch
|
|
||||||
Patch115: kdelibs-3.5.3-kde#129187.patch
|
|
||||||
Patch116: kdelibs-3.5.3-kde#116092.patch
|
|
||||||
|
|
||||||
%if %{arts}
|
%if %{arts}
|
||||||
Requires: arts >= %{arts_epoch}:%{arts_version}
|
Requires: arts >= %{arts_epoch}:%{arts_version}
|
||||||
|
@ -175,8 +152,7 @@ format for easy browsing
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-3.5.3
|
%setup -q
|
||||||
%patch0 -p0 -b .kde3.5.4
|
|
||||||
%patch1 -p1 -b .xdg-menu
|
%patch1 -p1 -b .xdg-menu
|
||||||
%if %{debug} == 0
|
%if %{debug} == 0
|
||||||
%patch2 -p1 -b .debug
|
%patch2 -p1 -b .debug
|
||||||
|
@ -194,26 +170,6 @@ format for easy browsing
|
||||||
%patch35 -p1 -b .inttype
|
%patch35 -p1 -b .inttype
|
||||||
%patch37 -p1 -b .kdebug-kmail-quiet
|
%patch37 -p1 -b .kdebug-kmail-quiet
|
||||||
%patch38 -p1 -b .cupsdconf2-group
|
%patch38 -p1 -b .cupsdconf2-group
|
||||||
#%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
|
|
||||||
|
|
||||||
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||||
|
|
||||||
|
@ -440,6 +396,9 @@ fi
|
||||||
%doc %{_docdir}/HTML/en/kdelibs*
|
%doc %{_docdir}/HTML/en/kdelibs*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 08 2006 Than Ngo <than@redhat.com> 6:3.5.4-1
|
||||||
|
- rebuilt
|
||||||
|
|
||||||
* Wed Jul 26 2006 Petr Rockai <prockai@redhat.com> - 6:3.5.4-0.pre2
|
* Wed Jul 26 2006 Petr Rockai <prockai@redhat.com> - 6:3.5.4-0.pre2
|
||||||
- drop the gcc workaround, problem fixed in gcc/g++
|
- drop the gcc workaround, problem fixed in gcc/g++
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue