* Fri May 23 2008 Rex Dieter <rdieter@fedoraproejct.org> - 4.0.72-7
- -common: provide %_datadir/apps/kdeui for kde3 apps (#447965)
This commit is contained in:
parent
19bd5a3481
commit
d70b6a1841
15
kdelibs.spec
15
kdelibs.spec
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.0.72
|
Version: 4.0.72
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
@ -227,11 +227,15 @@ rm -rf %{buildroot}
|
|||||||
%if 0%{?rest}
|
%if 0%{?rest}
|
||||||
make install DESTDIR=%{buildroot} -C %{_target_platform}
|
make install DESTDIR=%{buildroot} -C %{_target_platform}
|
||||||
|
|
||||||
# see also use-of/patching of XDG_MENU_PREFIX in kdebase
|
# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
|
||||||
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
|
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
|
||||||
%{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
|
%{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
|
||||||
|
|
||||||
%if "%{name}" != "kdelibs"
|
%if "%{name}" == "kdelibs"
|
||||||
|
# kdeui for kde3
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/apps
|
||||||
|
ln -s %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
|
||||||
|
%else
|
||||||
# remove files which conflict with KDE 3
|
# remove files which conflict with KDE 3
|
||||||
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
|
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
|
||||||
%{buildroot}%{_kde4_bindir}/kunittestmodrunner
|
%{buildroot}%{_kde4_bindir}/kunittestmodrunner
|
||||||
@ -249,6 +253,7 @@ do
|
|||||||
case "$i" in
|
case "$i" in
|
||||||
libkdeinit4_*.so)
|
libkdeinit4_*.so)
|
||||||
;;
|
;;
|
||||||
|
## FIXME/TODO: imo, should leave everything except for known-conflicts -- Rex
|
||||||
# don't move Phonon, non-KDE apps want to use it
|
# don't move Phonon, non-KDE apps want to use it
|
||||||
libphonon.so)
|
libphonon.so)
|
||||||
;;
|
;;
|
||||||
@ -340,6 +345,7 @@ rm -rf %{buildroot}
|
|||||||
%{_kde4_configdir}/ui/ui_standards.rc
|
%{_kde4_configdir}/ui/ui_standards.rc
|
||||||
%{_kde4_docdir}/HTML/en/common
|
%{_kde4_docdir}/HTML/en/common
|
||||||
%{_kde4_datadir}/locale/all_languages/
|
%{_kde4_datadir}/locale/all_languages/
|
||||||
|
%{_datadir}/apps/kdeui
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
@ -364,6 +370,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 23 2008 Rex Dieter <rdieter@fedoraproejct.org> - 4.0.72-7
|
||||||
|
- -common: provide %%_datadir/apps/kdeui for kde3 apps (#447965)
|
||||||
|
|
||||||
* Thu May 22 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.72-6
|
* Thu May 22 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.72-6
|
||||||
- kstandarddirs hack to search /etc/kde
|
- kstandarddirs hack to search /etc/kde
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user