This commit is contained in:
Than Ngo 2006-02-01 11:08:03 +00:00
parent 9a9521df8e
commit d96a3a42ca
3 changed files with 24 additions and 13 deletions

View File

@ -8,3 +8,4 @@ kdelibs-3.4.2.tar.bz2
kdelibs-3.4.91.tar.bz2
kdelibs-3.4.92.tar.bz2
kdelibs-3.5.0.tar.bz2
kdelibs-3.5.1.tar.bz2

View File

@ -8,12 +8,12 @@
%define cups_epoch 1
%define qt_version 3.3.5
%define arts_version 1.5.0
%define arts_version 1.5.1
%define kde_major_version 3
%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
%define make_cvs 1
%define make_cvs 0
%define fam 1
%define dnotify 1
%define pcre 1
@ -23,8 +23,8 @@
%define disable_gcc_check_and_hidden_visibility 1
Version: 3.5.0
Release: 6
Version: 3.5.1
Release: 1
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@ -40,7 +40,6 @@ Source3: kde-applications.menu
Source4: devices.protocol
Patch2: kdelibs-3.0.0-ndebug.patch
Patch3: kdelibs-3.2.0-icon.patch
Patch4: kdelibs-3.0.4-ksyscoca.patch
Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
Patch7: kdelibs-3.4.0-menu.patch
@ -53,8 +52,6 @@ Patch33: kdelibs-3.3.2-ppc.patch
Patch34: kdelibs-3.4.0-qtdoc.patch
Patch35: kdelibs-3.4.92-inttype.patch
Patch36: kdelibs-3.5.0-modular-x.patch
Patch37: kdelibs-3.5.0-kio-kdirlister.patch
Patch38: kdelibs-3.5.0-printing.patch
%if %{arts}
Requires: arts >= %{arts_epoch}:%{arts_version}
@ -113,7 +110,7 @@ BuildRequires: libtiff-devel
BuildRequires: pkgconfig
BuildRequires: autoconf automake
BuildRequires: libacl-devel
BuildRequires: libattr-devel
Obsoletes: %{name}2
Obsoletes: kdesupport
Obsoletes: kdoc
@ -181,8 +178,6 @@ format for easy browsing
%patch34 -p1 -b .qtdoc
%patch35 -p1 -b .inttype
%patch36 -p1 -b .modular-x
%patch37 -p1 -b .kicker_crash
%patch38 -p1 -b .printing
# add redhat into KDE_VERSION_STRING
%if %{redhatify}
@ -362,9 +357,21 @@ elif [ -d /etc/skel/Desktop/Autostart.rpmsave ]; then
fi
exit 0
%post -p /sbin/ldconfig
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/crystalsvg || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
fi
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
%postun -p /sbin/ldconfig
%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/crystalsvg || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
fi
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
%files
%defattr(-,root,root)
@ -403,6 +410,9 @@ exit 0
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
* Wed Feb 01 2006 Than Ngo <than@redhat.com> 6:3.5.1-1
- 3.5.1
* Thu Jan 19 2006 Than Ngo <than@redhat.com> 6:3.5.0-6
- rename subpackage to -apidocs

View File

@ -1 +1 @@
2b11d654e2ea1a3cd16dcfdcbb7d1915 kdelibs-3.5.0.tar.bz2
2a22193ae7c23f3759b02723dab02d30 kdelibs-3.5.1.tar.bz2