diff --git a/.cvsignore b/.cvsignore index 8e2ee6f..cf84b0b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdelibs-4.2.1.tar.bz2 +kdelibs-4.2.2.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index a78961f..cf05a6b 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,12 +1,13 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.2.1 -Release: 4%{?dist} +Version: 4.2.2 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs Epoch: 6 Obsoletes: kdelibs4 < %{version}-%{release} Provides: kdelibs4 = %{version}-%{release} +%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}} %else Name: kdelibs4 %endif @@ -94,8 +95,8 @@ BuildRequires: qt4-devel >= 4.4.0 #Requires: qt4%{?_isa} >= %{_qt4_version} Requires: qt4 >= %{_qt4_version} Requires: xdg-utils -Requires(post): /sbin/ldconfig xdg-utils -Requires(postun): /sbin/ldconfig xdg-utils +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig BuildRequires: alsa-lib-devel %if 0%{?fedora} < 9 @@ -141,6 +142,9 @@ BuildRequires: graphviz BuildRequires: qt4-doc %endif +Provides: kross(javascript) = %{version}-%{release} +Provides: kross(qtscript) = %{version}-%{release} + %description Libraries for the K Desktop Environment 4. @@ -303,14 +307,22 @@ cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4- %post -/sbin/ldconfig ||: -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : +/sbin/ldconfig +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : %postun /sbin/ldconfig ||: -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : +if [ $1 -eq 0 ] ; then + update-desktop-database -q &> /dev/null + update-mime-database %{_kde4_datadir}/mime &> /dev/null + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +fi + +%posttrans +update-desktop-database -q &> /dev/null +update-mime-database %{_kde4_datadir}/mime >& /dev/null +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %clean @@ -332,10 +344,10 @@ rm -rf %{buildroot} %exclude %{_kde4_appsdir}/cmake/ %{_kde4_configdir}/* %{_datadir}/dbus-1/interfaces/* -%{_kde4_datadir}/mime/packages/* +%{_kde4_datadir}/mime/packages/kde.xml %{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/servicetypes/* -%{_kde4_sharedir}/icons/hicolor/*/actions/* +%{_kde4_iconsdir}/hicolor/*/actions/* %{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_docdir}/HTML/en/kioslave/ %{_kde4_libdir}/lib*.so.* @@ -397,6 +409,24 @@ rm -rf %{buildroot} %changelog +* Wed Apr 1 2009 Lukáš Tinkl - 4.2.2-1 +- KDE 4.2.2 + +* Mon Mar 23 2009 Rex Dieter - 4.2.1-9 +- scriptlet optimization + +* Thu Mar 19 2009 Rex Dieter - 4.2.1-8 +- Provides: kdelibs4%%{?_isa} ... (#491082) + +* Wed Mar 18 2009 Rex Dieter 4.2.1-7 +- Provides: kross(javascript) kross(qtscript) (#490586) + +* Thu Mar 12 2009 Than Ngo - 4.2.1-6 +- apply patch to fix encoding for Qt-4.5.0 + +* Mon Mar 09 2009 Than Ngo - 4.2.1-5 +- apply patch to fix issue in CSS style that causes konqueror shows a blank page + * Wed Mar 05 2009 Rex Dieter - 4.2.1-4 - move designer plugins to main/runtime (#487622) diff --git a/sources b/sources index 8f87b40..7405e6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa4206dd747890c4e4283c8adb831e6c kdelibs-4.2.1.tar.bz2 +ff54817efef952e8812c607f5089c2e1 kdelibs-4.2.2.tar.bz2