update to 3.4.2
This commit is contained in:
parent
5f08b1a795
commit
cdc7bebcb0
@ -4,3 +4,4 @@ kdelibs-3.3.2.tar.bz2
|
||||
kdelibs-3.4.0-rc1.tar.bz2
|
||||
kdelibs-3.4.0.tar.bz2
|
||||
kdelibs-3.4.1.tar.bz2
|
||||
kdelibs-3.4.2.tar.bz2
|
||||
|
20
kdelibs.spec
20
kdelibs.spec
@ -8,7 +8,7 @@
|
||||
%define cups_epoch 1
|
||||
|
||||
%define qt_version 3.3.4
|
||||
%define arts_version 1.4.0
|
||||
%define arts_version 1.4.2
|
||||
%define kde_major_version 3
|
||||
|
||||
%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
|
||||
@ -21,8 +21,10 @@
|
||||
%define pie 1
|
||||
%define arts 1
|
||||
|
||||
Version: 3.4.1
|
||||
Release: 2
|
||||
%define disable_gcc_check_and_hidden_visibility 0
|
||||
|
||||
Version: 3.4.2
|
||||
Release: 1
|
||||
Summary: K Desktop Environment - Libraries
|
||||
Name: kdelibs
|
||||
Url: http://www.kde.org/
|
||||
@ -53,7 +55,6 @@ Patch33: kdelibs-3.3.2-ppc.patch
|
||||
Patch34: kdelibs-3.4.0-qtdoc.patch
|
||||
|
||||
# gcc4 workaround
|
||||
Patch200: admin-visibility.patch
|
||||
Patch201: kdelibs-3.4.0-gcc4-pr20973-workaround.patch
|
||||
|
||||
%if %{arts}
|
||||
@ -172,7 +173,6 @@ format for easy browsing.
|
||||
%patch32 -p1 -b .cups
|
||||
%patch33 -p1 -b .ppc
|
||||
%patch34 -p1 -b .qtdoc
|
||||
%patch200 -p1 -b .gcc4
|
||||
%patch201 -p1 -b .gcc4-pr20973
|
||||
|
||||
# add redhat into KDE_VERSION_STRING
|
||||
@ -184,6 +184,13 @@ format for easy browsing.
|
||||
export QTDOC=%{qtdocdir}
|
||||
unset QTDIR && . /etc/profile.d/qt.sh
|
||||
|
||||
%if %{disable_gcc_check_and_hidden_visibility}
|
||||
# disable gcc check
|
||||
perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
|
||||
# disable hidden visibility
|
||||
perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
|
||||
%endif
|
||||
|
||||
%if %{make_cvs}
|
||||
make -f admin/Makefile.common cvs
|
||||
%endif
|
||||
@ -385,6 +392,9 @@ exit 0
|
||||
%doc %{_docdir}/HTML/en/kdelibs*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 01 2005 Than Ngo <than@redhat.com> 6:3.4.2-1
|
||||
- update to 3.4.2
|
||||
|
||||
* Tue Jun 21 2005 Than Ngo <than@redhat.com> 6:3.4.1-2
|
||||
- add devices protocol #160927
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user