- apply patch to fix missing icons in KDE main menu
- requires redhat-artwork >= 0.239-2 - don't own /usr/share/icons/hicolor #178319 - remove broken links #154093
This commit is contained in:
parent
8a87cd357d
commit
85fe4be13e
|
@ -0,0 +1,21 @@
|
||||||
|
--- kdelibs-3.5.1/kded/applications.menu.orig 2006-02-21 14:30:11.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.1/kded/applications.menu 2006-02-21 14:30:16.000000000 +0100
|
||||||
|
@@ -31,12 +31,16 @@
|
||||||
|
<Category>Core</Category>
|
||||||
|
<Not><Category>KDE</Category></Not>
|
||||||
|
</And>
|
||||||
|
- <!-- Don't list SUSE's YaST in here -->
|
||||||
|
- <Category>X-SuSE-YaST</Category>
|
||||||
|
+ <Category>X-Red-Hat-Base</Category>
|
||||||
|
</Not>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
+ <Name>System Settings</Name>
|
||||||
|
+ <MergeFile>system-settings.menu</MergeFile>
|
||||||
|
+ </Menu>
|
||||||
|
+
|
||||||
|
+ <Menu>
|
||||||
|
<Name>Development</Name>
|
||||||
|
<Directory>kde-development.directory</Directory>
|
||||||
|
<Menu>
|
57
kdelibs.spec
57
kdelibs.spec
|
@ -24,7 +24,7 @@
|
||||||
%define disable_gcc_check_and_hidden_visibility 1
|
%define disable_gcc_check_and_hidden_visibility 1
|
||||||
|
|
||||||
Version: 3.5.1
|
Version: 3.5.1
|
||||||
Release: 2.2
|
Release: 2.3
|
||||||
Summary: K Desktop Environment - Libraries
|
Summary: K Desktop Environment - Libraries
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Url: http://www.kde.org/
|
Url: http://www.kde.org/
|
||||||
|
@ -36,9 +36,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
|
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
|
||||||
Source1: kde.sh
|
Source1: kde.sh
|
||||||
Source2: kde.csh
|
Source2: kde.csh
|
||||||
Source3: kde-applications.menu
|
Source3: devices.protocol
|
||||||
Source4: devices.protocol
|
|
||||||
|
|
||||||
|
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
||||||
Patch2: kdelibs-3.0.0-ndebug.patch
|
Patch2: kdelibs-3.0.0-ndebug.patch
|
||||||
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
||||||
Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
|
Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
|
||||||
|
@ -62,7 +62,7 @@ Requires: iceauth
|
||||||
|
|
||||||
%if %{redhatify}
|
%if %{redhatify}
|
||||||
Requires: desktop-backgrounds-basic
|
Requires: desktop-backgrounds-basic
|
||||||
Requires: redhat-artwork >= 0.129
|
Requires: redhat-artwork >= 0.239-2
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
Requires: redhat-menus >= 5.0.4
|
Requires: redhat-menus >= 5.0.4
|
||||||
%endif
|
%endif
|
||||||
|
@ -165,6 +165,7 @@ format for easy browsing
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p1 -b .xdg-menu
|
||||||
%if %{debug} == 0
|
%if %{debug} == 0
|
||||||
%patch2 -p1 -b .debug
|
%patch2 -p1 -b .debug
|
||||||
%endif
|
%endif
|
||||||
|
@ -291,7 +292,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install
|
make DESTDIR=$RPM_BUILD_ROOT install
|
||||||
|
|
||||||
chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
|
chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
|
||||||
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/services/
|
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/services/
|
||||||
|
|
||||||
pushd $RPM_BUILD_ROOT%{_docdir}
|
pushd $RPM_BUILD_ROOT%{_docdir}
|
||||||
ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
|
ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
|
||||||
|
@ -311,41 +312,12 @@ done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if %{redhatify}
|
%if %{redhatify}
|
||||||
pushd $RPM_BUILD_ROOT%{_datadir}/icons/crystalsvg
|
|
||||||
for s in 16x16 22x22 32x32 48x48 64x64 128x128; do
|
|
||||||
pushd $s/apps/ || continue
|
|
||||||
# package icons
|
|
||||||
ln -sf package_wordprocessing.png redhat-office.png
|
|
||||||
ln -sf package_network.png redhat-internet.png
|
|
||||||
ln -sf package_applications.png redhat-accessories.png
|
|
||||||
ln -sf package_graphics.png redhat-graphics.png
|
|
||||||
ln -sf package_games.png redhat-games.png
|
|
||||||
ln -sf multimedia.png redhat-sound_video.png
|
|
||||||
ln -sf package_settings.png redhat-preferences.png
|
|
||||||
ln -sf package_development.png redhat-programming.png
|
|
||||||
ln -sf ../filesystems/server.png redhat-network-server.png
|
|
||||||
ln -sf ../filesystems/server.png redhat-server_settings.png
|
|
||||||
ln -sf package_utilities.png redhat-system_tools.png
|
|
||||||
ln -sf package_system.png redhat-system_settings.png
|
|
||||||
ln -sf package_utilities.png redhat-tools.png
|
|
||||||
# app icons
|
|
||||||
ln -sf kmail.png redhat-email.png
|
|
||||||
ln -sf konqueror.png redhat-web-browser.png
|
|
||||||
ln -sf kfm.png redhat-filemanager.png
|
|
||||||
ln -sf kfm_home.png redhat-home.png
|
|
||||||
ln -sf kviewshell.png redhat-logviewer.png
|
|
||||||
# system settings
|
|
||||||
ln -sf multimedia.png system-config-soundcard.png
|
|
||||||
popd
|
|
||||||
done
|
|
||||||
popd
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
|
|
||||||
rm -f $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu
|
|
||||||
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xdg/menus/
|
|
||||||
pushd $RPM_BUILD_ROOT/etc/xdg/menus/
|
pushd $RPM_BUILD_ROOT/etc/xdg/menus/
|
||||||
ln -s applications-merged kde-applications-merged
|
mv applications.menu kde-applications.menu
|
||||||
|
ln -s applications-merged kde-applications-merged
|
||||||
popd
|
popd
|
||||||
echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
|
echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
|
@ -391,7 +363,8 @@ fi
|
||||||
%dir %{_datadir}/config
|
%dir %{_datadir}/config
|
||||||
%config(noreplace) %{_datadir}/config/*
|
%config(noreplace) %{_datadir}/config/*
|
||||||
%{_datadir}/emoticons
|
%{_datadir}/emoticons
|
||||||
%{_datadir}/icons
|
%{_datadir}/icons/crystalsvg/
|
||||||
|
%{_datadir}/icons/default.kde
|
||||||
%{_datadir}/mimelnk
|
%{_datadir}/mimelnk
|
||||||
%{_datadir}/autostart
|
%{_datadir}/autostart
|
||||||
%{_datadir}/services
|
%{_datadir}/services
|
||||||
|
@ -412,6 +385,12 @@ fi
|
||||||
%doc %{_docdir}/HTML/en/kdelibs*
|
%doc %{_docdir}/HTML/en/kdelibs*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 21 2006 Than Ngo <than@redhat.com> 6:3.5.1-2.3
|
||||||
|
- apply patch to fix missing icons in KDE main menu
|
||||||
|
- requires redhat-artwork >= 0.239-2
|
||||||
|
- don't own /usr/share/icons/hicolor #178319
|
||||||
|
- remove broken links #154093
|
||||||
|
|
||||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 6:3.5.1-2.2
|
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 6:3.5.1-2.2
|
||||||
- bump again for double-long bug on ppc(64)
|
- bump again for double-long bug on ppc(64)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue