* update to KDE 3.5 Beta1

* remove gcc fix which is include in new upstrea,
This commit is contained in:
Than Ngo 2005-09-28 13:41:04 +00:00
parent 2f86c67fb5
commit 0f8d768eed
4 changed files with 40 additions and 18 deletions

View File

@ -5,3 +5,4 @@ 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
kdelibs-3.4.91.tar.bz2

View File

@ -0,0 +1,26 @@
--- kdelibs-3.4.91/kdecore/Makefile.am.orig 2005-09-27 17:15:22.000000000 +0200
+++ kdelibs-3.4.91/kdecore/Makefile.am 2005-09-27 17:14:37.000000000 +0200
@@ -172,14 +172,6 @@
kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries)
kgrantpty_LDADD = ./libkdefakes.la
-# kgrantpty needs to be installed setuid root
-install-exec-hook:
- @(chown 0 $(DESTDIR)$(bindir)/kgrantpty && chmod 4755 $(DESTDIR)$(bindir)/kgrantpty) || echo "Please make kgrantpty setuid root" >&2
- @echo ""
- @echo "kgrantpty is by default installed with a set SETUID root bit!"
- @echo "This is needed for konsole, etc. to ensure that they can't be eavesdropped."
- @echo ""
-
DISTCLEANFILES = kde-config.cpp
DOXYGEN_REFERENCES = dcop kdeui kparts kio
--- kdelibs-3.4.91/kio/misc/kpac/Makefile.am.orig 2005-09-27 17:15:39.000000000 +0200
+++ kdelibs-3.4.91/kio/misc/kpac/Makefile.am 2005-09-27 17:15:58.000000000 +0200
@@ -24,6 +24,3 @@
proxyscoutdatadir = $(kde_datadir)/proxyscout
proxyscoutdata_DATA = eventsrc
-
-install-exec-local:
- @(chown root $(DESTDIR)$(bindir)/kpac_dhcp_helper && chmod 4755 $(DESTDIR)$(bindir)/kpac_dhcp_helper) || echo "Please make kpac_dhcp_helper setuid root"

View File

@ -7,8 +7,8 @@
%define arts_epoch 8
%define cups_epoch 1
%define qt_version 3.3.4
%define arts_version 1.4.2
%define qt_version 3.3.5
%define arts_version 1.4.91
%define kde_major_version 3
%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
@ -23,8 +23,8 @@
%define disable_gcc_check_and_hidden_visibility 1
Version: 3.4.2
Release: 2
Version: 3.4.91
Release: 1
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@ -39,14 +39,12 @@ Source2: kde.csh
Source3: kde-applications.menu
Source4: devices.protocol
Patch1: kdelibs-3.2.2-pie.patch
Patch2: kdelibs-3.0.0-ndebug.patch
Patch3: kdelibs-3.2.0-icon.patch
Patch4: kdelibs-3.0.4-ksyscoca.patch
Patch5: kdelibs-3.3.0-openssl.patch
Patch6: kdelibs-3.4.0-fonts.patch
Patch7: kdelibs-3.4.0-menu.patch
Patch15: kdelibs-3.3.92-buildroot.patch
Patch15: kdelibs-3.4.91-buildroot.patch
Patch16: kdelibs-3.1-ssl-krb5.patch
Patch20: kdelibs-3.3.92-defaultstyle.patch
Patch24: kdelibs-3.1-libtool.patch
@ -54,9 +52,6 @@ Patch32: kdelibs-3.2.3-cups.patch
Patch33: kdelibs-3.3.2-ppc.patch
Patch34: kdelibs-3.4.0-qtdoc.patch
# gcc4 workaround
Patch201: kdelibs-3.4.0-gcc4-pr20973-workaround.patch
%if %{arts}
Requires: arts >= %{arts_epoch}:%{arts_version}
%endif
@ -156,17 +151,12 @@ format for easy browsing.
%prep
%setup -q
%if %{pie}
%patch1 -p1 -b .pie
%endif
%if %{debug} == 0
%patch2 -p1 -b .debug
%endif
%patch4 -p1 -b .ksyscoca
%patch5 -p1 -b .openssl
%patch6 -p1 -b .fonts
%patch7 -p1 -b -menu
%patch7 -p1 -b .menu
%patch15 -p1 -b .buildroot
%patch16 -p1 -b .ssl-krb5
%patch20 -p1 -b .defaultstyle
@ -174,7 +164,6 @@ format for easy browsing.
%patch32 -p1 -b .cups
%patch33 -p1 -b .ppc
%patch34 -p1 -b .qtdoc
%patch201 -p1 -b .gcc4-pr20973
# add redhat into KDE_VERSION_STRING
%if %{redhatify}
@ -241,6 +230,9 @@ fi
--enable-cups \
--enable-mitshm \
--with-xinerama \
%if %{pie}
--enable-pie \
%endif
%if %{arts} == 0
--without-arts \
%endif
@ -393,6 +385,9 @@ exit 0
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
* Tue Sep 27 2005 Than Ngo <than@redhat.com> 6:3.4.91-1
- update to KDE 3.5 Beta1
* Mon Aug 08 2005 Than Ngo <than@redhat.com> 6:3.4.2-2
- add requires xorg-x11 #165287

View File

@ -1 +1 @@
fe69f2f5c66dffd8fc741dcff221b80c kdelibs-3.4.2.tar.bz2
9981060a65037471f561ca11b2501792 kdelibs-3.4.91.tar.bz2