auto-import kdelibs-3.2.2-4 from kdelibs-3.2.2-4.src.rpm

This commit is contained in:
cvsdist 2004-09-09 07:06:43 +00:00
parent ebfd0aab2e
commit 101629abfd
3 changed files with 68 additions and 44 deletions

View File

@ -1 +1 @@
kdelibs-3.2.1.tar.bz2
kdelibs-3.2.2.tar.bz2

View File

@ -9,7 +9,7 @@
%define final 0
%define qt_version 3.3.1
%define arts_version 1.2.1
%define arts_version 1.2.2
%define kde_major_version 3
@ -19,8 +19,8 @@
%define pcre 0
%define alsa 1
Version: 3.2.1
Release: 1.4
Version: 3.2.2
Release: 4
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@ -43,11 +43,13 @@ 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
Patch29: kdelibs-3.2.2-misc.patch
Patch30: kdelibs-3.2.2-dock.patch
Requires: qt >= 1:%{qt_version}
Requires: arts >= 8:%{arts_version}
Requires: openssl = 0.9.7a
Requires: cups-libs >= 1.1.12
Requires: cups-libs >= 1:1.1.12
%if %{redhatify}
Requires: desktop-backgrounds-basic
@ -56,45 +58,45 @@ Requires: hicolor-icon-theme
Requires: redhat-menus >= 1.0
%endif
Prereq: fileutils
Prereq: shadow-utils
Prereq: /sbin/ldconfig
Prereq: dev
Requires: fileutils
Requires: shadow-utils
Requires: /sbin/ldconfig
Requires: dev
%if %{fam}
BuildPrereq: fam-devel
BuildRequires: fam-devel
%endif
%if %{pcre}
BuildPrereq: pcre-devel
BuildRequires: pcre-devel
%endif
BuildPrereq: cups-devel >= 1.1.20
BuildPrereq: qt-devel >= %{qt_version}
BuildPrereq: flex >= 2.5.4a-13
BuildPrereq: doxygen
BuildPrereq: libxslt-devel >= 1.1.2
BuildPrereq: sgml-common
BuildPrereq: openjade
BuildPrereq: jadetex
BuildPrereq: docbook-dtd31-sgml
BuildPrereq: docbook-style-dsssl
BuildPrereq: perl-SGMLSpm
BuildPrereq: docbook-utils
BuildPrereq: zlib-devel
BuildPrereq: arts-devel >= 7:1.2.1
BuildPrereq: audiofile-devel
BuildPrereq: openssl-devel
BuildPrereq: perl
BuildPrereq: gawk
BuildPrereq: byacc
BuildPrereq: libart_lgpl-devel >= 2.3.8
BuildPrereq: bzip2-devel
BuildPrereq: libjpeg-devel
BuildPrereq: pkgconfig
%if %{alsa}
BuildPrereq: alsa-lib-devel >= 1.0.2
%endif
BuildRequires: cups-devel >= 1:1.1.20
BuildRequires: qt-devel >= 1:%{qt_version}
BuildRequires: flex >= 2.5.4a-13
BuildRequires: doxygen
BuildRequires: libxslt-devel >= 1.1.2
BuildRequires: sgml-common
BuildRequires: openjade
BuildRequires: jadetex
BuildRequires: docbook-dtd31-sgml
BuildRequires: docbook-style-dsssl
BuildRequires: perl-SGMLSpm
BuildRequires: docbook-utils
BuildRequires: zlib-devel
BuildRequires: arts-devel >= 8:%{arts_version}
BuildRequires: audiofile-devel
BuildRequires: openssl-devel
BuildRequires: perl
BuildRequires: gawk
BuildRequires: byacc
BuildRequires: libart_lgpl-devel >= 2.3.8
BuildRequires: bzip2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: pkgconfig
BuildRequires: autoconf automake
Obsoletes: %{name}2
Obsoletes: kdesupport
@ -110,6 +112,11 @@ Group: Development/Libraries
Summary: Header files and documentation for compiling KDE applications.
Requires: qt-devel >= 1:%{qt_version}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: arts-devel
Requires: libart_lgpl-devel
%if %{fam}
Requires: fam-devel
%endif
%if %{pcre}
Requires: pcre-devel
%endif
@ -135,6 +142,8 @@ format for easy browsing.
%patch22 -p1 -b .kio
%patch24 -p1 -b .libtool
%patch28 -p1 -b .openssl
%patch29 -p1 -b .misc
%patch30 -p1 -b .dock
# add redhat into KDE_VERSION_STRING
%if %{redhatify}
@ -145,14 +154,14 @@ format for easy browsing.
unset QTDIR && . /etc/profile.d/qt.sh
%if %{libtool}
make -f admin/Makefile.common cvs
make -f admin/Makefile.common cvs
%endif
# set some default FLAGS
FLAGS="$RPM_OPT_FLAGS"
%if %{debug}
FLAGS="-O0"
FLAGS="-O0"
%endif
export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
@ -254,12 +263,11 @@ if [ -d /etc/skel/Desktop/Autostart ]; then
elif [ -d /etc/skel/Desktop/Autostart.rpmsave ]; then
mv -f /etc/skel/Desktop/Autostart.rpmsave /etc/skel/Desktop/Autostart-OLD..KDE
fi
exit 0
%post
/sbin/ldconfig
%post -p /sbin/ldconfig
%postun
/sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
@ -343,6 +351,22 @@ fi
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
* Wed Apr 21 2004 Than Ngo <than@redhat.com> 3.2.2-4
- Implements the FreeDesktop System Tray Protocol, thanks to Harald Hoyer
* Mon Apr 19 2004 Than Ngo <than@redhat.com> 3.2.2-3
- fix #120265 #119642
* Sun Apr 18 2004 Warren Togami <wtogami@redhat.com> 3.2.2-2
- #120265 #119642 -devel req alsa-lib-devel esound-devel fam-devel
glib2-devel libart_lgpl-devel
- #88853 BR autoconf automake libpng-devel libvorbis-devel
glib2-devel libtiff-devel
- cups-libs explicit epoch, some cleanups
* Tue Apr 13 2004 Than Ngo <than@redhat.com> 3.2.2-1
- 3.2.2 release
* Fri Mar 12 2004 Than Ngo <than@redhat.com> 6:3.2.1-1.4
- rebuild

View File

@ -1 +1 @@
50ae60072c1fc4ae4e41694bc2325dcb kdelibs-3.2.1.tar.bz2
76c656fb4ec7f1ca073f52fad2b8898b kdelibs-3.2.2.tar.bz2