From ed73455bdac219af1850a174307264955d50a0bc Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:08:43 +0000 Subject: [PATCH] auto-import kdelibs-3.2.92-2 from kdelibs-3.2.92-2.src.rpm --- .cvsignore | 2 +- kdelibs.spec | 52 ++++++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index 20f7d0d..83f65aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdelibs-3.2.3.tar.bz2 +kdelibs-3.2.92.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index 34447bc..2d385fc 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -5,7 +5,6 @@ %define qt_version 3.3.2 %define arts_version 1.2.3 - %define kde_major_version 3 %define libtool 1 @@ -14,9 +13,10 @@ %define pcre 1 %define alsa 1 %define pie 1 +%define arts 1 -Version: 3.2.3 -Release: 6 +Version: 3.2.92 +Release: 2 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -33,19 +33,18 @@ 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 -Patch11: kdelibs-3.1.93-lib64.patch Patch15: kdelibs-3.1.95-buildroot.patch Patch16: kdelibs-3.1-ssl-krb5.patch Patch20: kdelibs-3.1-defaultstyle.patch Patch22: kdelibs-3.1-kio.patch Patch24: kdelibs-3.1-libtool.patch -Patch28: kdelibs-3.1.3-openssl.patch -Patch30: kdelibs-3.2.2-dock.patch Patch31: kdelibs-3.2.2-kate-setInputMethodEnabled-20040525.diff Patch32: kdelibs-3.2.3-cups.patch -Requires: qt >= 1:%{qt_version} +%if %{arts} Requires: arts >= 8:%{arts_version} +%endif +Requires: qt >= 1:%{qt_version} Requires: openssl = 0.9.7a Requires: cups-libs >= 1:1.1.12 @@ -82,7 +81,9 @@ BuildRequires: docbook-style-dsssl BuildRequires: perl-SGMLSpm BuildRequires: docbook-utils BuildRequires: zlib-devel +%if %{arts} BuildRequires: arts-devel >= 8:%{arts_version} +%endif BuildRequires: audiofile-devel BuildRequires: openssl-devel BuildRequires: perl @@ -98,6 +99,7 @@ BuildRequires: autoconf automake Obsoletes: %{name}2 Obsoletes: kdesupport +Obsoletes: kdoc %description Libraries for the K Desktop Environment: @@ -111,7 +113,9 @@ Group: Development/Libraries Summary: Header files and documentation for compiling KDE applications. Requires: qt-devel >= 1:%{qt_version} Requires: %{name} = %{epoch}:%{version}-%{release} +%if %{arts} Requires: arts-devel +%endif Requires: libart_lgpl-devel Requires: libxslt-devel Requires: libjpeg-devel @@ -119,12 +123,14 @@ Requires: zlib-devel Requires: openssl-devel Requires: bzip2-devel Requires: libtiff-devel + %if %{fam} Requires: fam-devel %endif %if %{pcre} Requires: pcre-devel %endif +Obsoletes: kdesupport-devel %description devel This package includes the header files you will need to compile @@ -140,16 +146,12 @@ format for easy browsing. %if %{debug} == 0 %patch2 -p1 -b .debug %endif -%patch3 -p1 -b .icon %patch4 -p1 -b .ksyscoca -%patch11 -p1 -b .lib64 %patch15 -p1 -b .buildroot %patch16 -p1 -b .ssl-krb5 %patch20 -p1 -b .defaultstyle %patch22 -p1 -b .kio %patch24 -p1 -b .libtool -%patch28 -p1 -b .openssl -%patch30 -p1 -b .dock %patch31 -p1 -b .im %patch32 -p1 -b .cups @@ -174,6 +176,7 @@ FLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$FLAGS -fno-use-cxa-atexit" export CFLAGS="$FLAGS" +export QTLIB=$QTDIR/lib if pkg-config openssl ; then export CFLAGS="$CFLAGS `pkg-config --cflags openssl`" @@ -192,11 +195,20 @@ fi fi %endif +suffix="" +if [ "%{_lib}" == "lib64" ] ; then + suffix="64" +fi + %configure \ - --with-qt-libraries=$QTDIR/lib \ + --with-qt-libraries=$QTLIB \ + --enable-libsuffix="$suffix" \ --enable-cups \ --enable-mitshm \ --with-xinerama \ +%if %{arts} == 0 + --without-arts \ +%endif %if %{redhatify} --with-distribution="$VERSION" \ %endif @@ -244,8 +256,9 @@ popd mkdir -p $RPM_BUILD_ROOT/etc/profile.d install -m 755 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/ -# remove some mime files, which are included in openoffice -rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/vnd.sun* +# Remove file conflicts with openoffice +rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/vnd.sun* \ + $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/vnd.stardivision* # Make symlinks relative pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en @@ -283,7 +296,13 @@ exit 0 %attr(4755,root,root) %{_bindir}/kgrantpty /etc/profile.d/* /etc/xdg/menus/* +%{_bindir}/ghns +%{_bindir}/fileshareset +%{_bindir}/khotnewstuff +%{_bindir}/makekdewidgets +%if %{arts} %{_bindir}/artsmessage +%endif %{_bindir}/checkXML %{_bindir}/cupsdconf %{_bindir}/cupsdoprint @@ -357,6 +376,11 @@ exit 0 %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Fri Jul 23 2004 Than Ngo 3.2.92-2 +- update to KDE 3.3 Beta 2 +- remove some unneeded patch files +- enable libsuffix + * Mon Jul 19 2004 Than Ngo 6:3.2.3-6 - add IM patch - set kprinter default to cups diff --git a/sources b/sources index 5055590..6d9d714 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 +0f4a20ef8c38f3300fba5d1624cca0c8 kdelibs-3.2.92.tar.bz2