fix files conflicts with 4.2.x
This commit is contained in:
parent
53ce1648aa
commit
93b7966383
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
Summary: K Desktop Environment 3 - Libraries
|
Summary: K Desktop Environment 3 - Libraries
|
||||||
Version: 3.5.10
|
Version: 3.5.10
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs3
|
Name: kdelibs3
|
||||||
@ -459,6 +459,13 @@ rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
|
|||||||
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
||||||
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
||||||
rm -rf %{buildroot}%{_datadir}/autostart/
|
rm -rf %{buildroot}%{_datadir}/autostart/
|
||||||
|
rm -r %{buildroot}%{_datadir}/config/colors/40.colors
|
||||||
|
rm -f %{buildroot}%{_datadir}/config/colors/Rainbow.colors
|
||||||
|
rm -f %{buildroot}%{_datadir}/config/colors/Royal.colors
|
||||||
|
rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
|
||||||
|
rm -f %{buildroot}%{_datadir}/config/ksslcalist
|
||||||
|
rm -f %{buildroot}%{_bindir}/preparetips
|
||||||
|
|
||||||
# don't show kresources
|
# don't show kresources
|
||||||
sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||||
|
|
||||||
@ -636,6 +643,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 25 2009 Than Ngo <than@redhat.com> - 3.5.10-7
|
||||||
|
- fix files conflicts with 4.2.x
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-6
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user