Compare commits
5 Commits
master
...
private-kd
Author | SHA1 | Date | |
---|---|---|---|
|
b75f914150 | ||
|
17543dd98f | ||
|
6614cdaf38 | ||
|
46f56644cc | ||
|
a3ab531671 |
@ -1,3 +1,5 @@
|
||||
kdelibs-3.3.0.tar.bz2
|
||||
kdelibs-3.3.1.tar.bz2
|
||||
kdelibs-3.3.2.tar.bz2
|
||||
kdelibs-3.3.92.tar.bz2
|
||||
kdelibs-3.4.0-rc1.tar.bz2
|
||||
|
11
kdelibs-3.3.92-defaultstyle.patch
Normal file
11
kdelibs-3.3.92-defaultstyle.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- kdelibs-3.3.92/kdefx/kstyle.cpp.defaultstyle 2004-11-18 00:54:47.000000000 +0100
|
||||
+++ kdelibs-3.3.92/kdefx/kstyle.cpp 2005-02-14 18:13:11.584981009 +0100
|
||||
@@ -238,7 +238,7 @@
|
||||
QString KStyle::defaultStyle()
|
||||
{
|
||||
if (QPixmap::defaultDepth() > 8)
|
||||
- return QString("plastik");
|
||||
+ return QString("Bluecurve");
|
||||
else
|
||||
return QString("light, 3rd revision");
|
||||
}
|
89
kdelibs.spec
89
kdelibs.spec
@ -4,10 +4,10 @@
|
||||
%define final 0
|
||||
|
||||
%define qt_version 3.3.3
|
||||
%define arts_version 1.3.0
|
||||
%define arts_version 1.4.0
|
||||
%define kde_major_version 3
|
||||
|
||||
%define libtool 1
|
||||
%define make_cvs 1
|
||||
%define fam 1
|
||||
%define dnotify 1
|
||||
%define pcre 1
|
||||
@ -15,8 +15,8 @@
|
||||
%define pie 1
|
||||
%define arts 1
|
||||
|
||||
Version: 3.3.2
|
||||
Release: 0.7
|
||||
Version: 3.4.0
|
||||
Release: 0.rc1.0
|
||||
Summary: K Desktop Environment - Libraries
|
||||
Name: kdelibs
|
||||
Url: http://www.kde.org/
|
||||
@ -25,7 +25,7 @@ Group: System Environment/Libraries
|
||||
License: LGPL
|
||||
BuildRoot: %{_tmppath}/%{name}-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}-rc1.tar.bz2
|
||||
Source1: kde.sh
|
||||
Source2: kde.csh
|
||||
|
||||
@ -34,25 +34,13 @@ Patch2: kdelibs-3.0.0-ndebug.patch
|
||||
Patch3: kdelibs-3.2.0-icon.patch
|
||||
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
||||
Patch5: kdelibs-3.3.0-openssl.patch
|
||||
Patch15: kdelibs-3.1.95-buildroot.patch
|
||||
Patch15: kdelibs-3.3.92-buildroot.patch
|
||||
Patch16: kdelibs-3.1-ssl-krb5.patch
|
||||
Patch20: kdelibs-3.1-defaultstyle.patch
|
||||
Patch22: kdelibs-3.1-kio.patch
|
||||
Patch20: kdelibs-3.3.92-defaultstyle.patch
|
||||
Patch24: kdelibs-3.1-libtool.patch
|
||||
Patch31: kdelibs-3.3.2-kate-immodule.patch
|
||||
Patch32: kdelibs-3.2.3-cups.patch
|
||||
Patch33: kdelibs-3.3.2-ppc.patch
|
||||
|
||||
# Upstreams patches
|
||||
Patch101: kdelibs-3.3.2-arts.patch
|
||||
Patch102: kdelibs-3.3.2-cleanup.patch
|
||||
|
||||
# security fixes
|
||||
# Patch200: KDE Security Advisory: plain text password exposure
|
||||
Patch200: post-3.3.2-kdelibs-kio.diff
|
||||
# Patch202: KDE Security Advisory: Konqueror Window Injection Vulnerability
|
||||
Patch201: post-3.3.2-kdelibs-htmlframes2.patch
|
||||
|
||||
%if %{arts}
|
||||
Requires: arts >= 8:%{arts_version}
|
||||
%endif
|
||||
@ -164,21 +152,10 @@ format for easy browsing.
|
||||
%patch15 -p1 -b .buildroot
|
||||
%patch16 -p1 -b .ssl-krb5
|
||||
%patch20 -p1 -b .defaultstyle
|
||||
%patch22 -p1 -b .kio
|
||||
%patch24 -p1 -b .libtool
|
||||
%patch31 -p1 -b .im
|
||||
%patch32 -p1 -b .cups
|
||||
%patch33 -p1 -b .ppc
|
||||
|
||||
%patch101 -p1 -b .arts
|
||||
%patch102 -p1 -b .cleanup
|
||||
|
||||
# security fixes
|
||||
pushd kio/kio
|
||||
%patch200 -p0 -b .smb
|
||||
popd
|
||||
%patch201 -p0 -b .html2
|
||||
|
||||
# add redhat into KDE_VERSION_STRING
|
||||
%if %{redhatify}
|
||||
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
|
||||
@ -187,7 +164,7 @@ popd
|
||||
%build
|
||||
unset QTDIR && . /etc/profile.d/qt.sh
|
||||
|
||||
%if %{libtool}
|
||||
%if %{make_cvs}
|
||||
make -f admin/Makefile.common cvs
|
||||
%endif
|
||||
|
||||
@ -301,9 +278,37 @@ done
|
||||
popd
|
||||
|
||||
%if %{redhatify}
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
|
||||
mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde
|
||||
echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
|
||||
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 ../filesystem/server.png redhat-network-server.png
|
||||
ln -sf ../filesystem/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
|
||||
mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde
|
||||
echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
|
||||
%endif
|
||||
|
||||
%clean
|
||||
@ -327,7 +332,7 @@ exit 0
|
||||
%attr(4755,root,root) %{_bindir}/kgrantpty
|
||||
/etc/profile.d/*
|
||||
/etc/xdg/menus/*
|
||||
%{_bindir}/ghns
|
||||
%{_bindir}/kcmshell
|
||||
%{_bindir}/fileshareset
|
||||
%{_bindir}/khotnewstuff
|
||||
%{_bindir}/makekdewidgets
|
||||
@ -389,6 +394,7 @@ exit 0
|
||||
%{_datadir}/locale/all_languages
|
||||
%dir %{_datadir}/config
|
||||
%config(noreplace) %{_datadir}/config/*
|
||||
%{_datadir}/emoticons
|
||||
%{_datadir}/icons
|
||||
%{_datadir}/mimelnk
|
||||
%{_datadir}/autostart
|
||||
@ -407,6 +413,19 @@ exit 0
|
||||
%doc %{_docdir}/HTML/en/kdelibs*
|
||||
|
||||
%changelog
|
||||
* Fri Feb 25 2005 Than Ngo <than@redhat.com> 6:3.4.0-0.rc1.0
|
||||
- KDE 3.4.0 rc1
|
||||
|
||||
* Tue Feb 22 2005 Than Ngo <than@redhat.com> 6:3.3.92-0.3
|
||||
- respin KDE 3.4 beta2
|
||||
|
||||
* Thu Feb 17 2005 Than Ngo <than@redhat.com> 6:3.3.92-0.2
|
||||
- Add symlinks to crystal icons, thanks Peter Rockai, #121929
|
||||
- fix export
|
||||
|
||||
* Mon Feb 14 2005 Than Ngo <than@redhat.com> 6:3.3.92-0.1
|
||||
- KDE 3.4 Beta2
|
||||
|
||||
* Sat Feb 12 2005 Than Ngo <than@redhat.com> 6:3.3.2-0.7
|
||||
- backport CVS patch, cleanup InputMethod
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user