auto-import kdelibs-3.1.95-0.3 from kdelibs-3.1.95-0.3.src.rpm

This commit is contained in:
cvsdist 2004-09-09 07:05:04 +00:00
parent 69d3f67c11
commit c9fe4d7fd1
5 changed files with 174 additions and 222 deletions

View File

@ -1 +1 @@
kdelibs-3.1.4.tar.bz2
kdelibs-3.1.95.tar.bz2

5
kde.csh Executable file
View File

@ -0,0 +1,5 @@
# Make sure KDEDIR is set
if ( $?KDEDIR ) then
exit
endif
setenv KDEDIR /usr

3
kde.sh Executable file
View File

@ -0,0 +1,3 @@
# Make sure KDEDIR is set
[ -z "$KDEDIR" ] && KDEDIR="/usr"
export KDEDIR

View File

@ -3,24 +3,24 @@
%define optflags -O0 -g
%endif
%define redhatify 1
%define debug 0
%define final 0
%define cups 1
%define qtversion 3.1.2
%define qt_version 3.2.2
%define arts_version 1.1.94
%define kde_major_version 3
%define desktop_file 1
%define desktop_file_utils_version 0.2.93
%define libtool 1
%define fam 0
%define xrandr 1
%define menu_path /var/lib/menu
%define fam 1
%define dnotify 0
%define pcre 0
%define alsa 1
Version: 3.1.4
Release: 7
Version: 3.1.95
Release: 0.3
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@ -30,63 +30,34 @@ Group: System Environment/Libraries
License: LGPL
BuildRoot: %{_tmppath}/%{name}-buildroot
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: desktop-create-kmenu.c
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: kde.sh
Source2: kde.csh
Patch1: kdelibs-3.0-noxs.patch
Patch2: kdelibs-3.0.0-ndebug.patch
Patch3: kdelibs-3.1.4-icon.patch
Patch4: kdelibs-3.0.4-ksyscoca.patch
Patch5: kdelibs-2.1.1-path.patch
Patch6: kdelibs-3.0-rpath.patch
Patch7: kdelibs-3.0.2-dock.patch
Patch8: kdelibs-3.1.1-lang.patch
Patch9: kdelibs-3.0.3-redhat.patch
Patch10: kdelibs-3.0.4-dtfix.patch
Patch11: kdelibs-3.0.3-lib64.patch
Patch12: kioslavetest.patch
Patch13: metatest.patch
Patch14: kdelibs-3.1-ansi.patch
Patch15: kdelibs-3.1-buildroot.patch
Patch11: kdelibs-3.1.93-lib64.patch
Patch15: kdelibs-3.1.95-buildroot.patch
Patch16: kdelibs-3.1-ssl-krb5.patch
Patch20: kdelibs-3.1-defaultstyle.patch
Patch21: kdelibs-3.1-flash.patch
Patch22: kdelibs-3.1-kio.patch
Patch23: kdelibs-3.1-no.patch
Patch24: kdelibs-3.1-libtool.patch
Patch25: kdelibs-3.1-gnome-menu.patch
Patch26: kdelibs-3.1.3a-xrandr.patch
Patch27: kdelibs-3.1.1-pcre.patch
Patch28: kdelibs-3.1.2-openssl.patch
Patch30: kdelibs-3.1.3-gcc33.patch
Patch31: kdelibs-3.1.3-fullscreen-gtk.patch
Patch32: kdelibs-3.1.4-flags.patch
# security fix
Patch100: post-3.1.5-kdelibs-kapplication.patch
Patch101: post-3.1.5-kdelibs-ktelnetservice.patch
Patch102: post-3.1.5-kdelibs-kstandarddirs.patch
Patch103: post-3.1.5-kdelibs-htmlframes.patch
Patch104: post-3.1.5-kdelibs-kcookiejar.patch
Requires: qt >= 1:%{qtversion}
Requires: arts >= 8:1.1.4
Requires: qt >= 1:%{qt_version}
Requires: arts >= 8:%{arts_version}
Requires: openssl = 0.9.7a
%if %{cups}
Requires: cups-libs >= 1.1.12
BuildRequires: cups-devel >= 1.1.12
%if %{redhatify}
Requires: desktop-backgrounds-basic
Requires: redhat-artwork >= 0.83
Requires: hicolor-icon-theme
%endif
%if %{desktop_file}
Requires: desktop-backgrounds-basic
Requires: redhat-menus => 0.30
Requires: redhat-artwork >= 0.83
Prereq: fileutils
Prereq: shadow-utils
Prereq: desktop-file-utils >= %{desktop_file_utils_version}
%endif
Prereq: /sbin/ldconfig
Prereq: dev
@ -94,7 +65,12 @@ Prereq: dev
BuildPrereq: fam-devel
%endif
BuildPrereq: qt-devel >= 1:%{qtversion}
%if %{pcre}
BuildPrereq: pcre-devel
%endif
BuildPrereq: cups-devel >= 1.1.12
BuildPrereq: qt-devel >= %{qt_version}
BuildPrereq: flex >= 2.5.4a-13
BuildPrereq: doxygen
BuildPrereq: libxslt-devel >= 1.0.9
@ -105,7 +81,6 @@ BuildPrereq: docbook-dtd31-sgml
BuildPrereq: docbook-style-dsssl
BuildPrereq: perl-SGMLSpm
BuildPrereq: docbook-utils
BuildPrereq: pcre-devel
BuildPrereq: zlib-devel
BuildPrereq: arts-devel >= 7:1.1.1
BuildPrereq: audiofile-devel
@ -117,7 +92,9 @@ BuildPrereq: libart_lgpl-devel >= 2.3.8
BuildPrereq: bzip2-devel
BuildPrereq: libjpeg-devel
BuildPrereq: pkgconfig
%if %{alsa}
BuildPrereq: alsa-lib-devel >= 0.9.8
%endif
Obsoletes: %{name}2
Obsoletes: kdesupport
@ -131,9 +108,11 @@ kimgio (image manipulation).
%package devel
Group: Development/Libraries
Summary: Header files and documentation for compiling KDE applications.
Requires: qt-devel >= 1:%{qtversion}
Requires: qt-devel >= 1:%{qt_version}
Requires: %{name} = %{epoch}:%{version}-%{release}
%if %{pcre}
Requires: pcre-devel
%endif
Obsoletes: kdesupport-devel
%description devel
@ -144,62 +123,38 @@ format for easy browsing.
%prep
%setup -q
%patch1 -p1 -b .noxs
%if %{debug} == 0
%patch2 -p1 -b .debug
%endif
%patch3 -p1 -b .icon
#%patch3 -p1 -b .icon
%patch4 -p1 -b .ksyscoca
%patch5 -p1 -b .path
%patch6 -p1 -b .rpath
%patch7 -p1 -b .dock
%patch8 -p1 -b .lang
%patch9 -p1 -b .menu
%patch10 -p1 -b .dtfix
%patch11 -p1 -b .lib64
%patch12 -p0
%patch13 -p0
%patch15 -p1 -b .buildroot
%patch16 -p1 -b .ssl-krb5
%patch20 -p1 -b .defaultstyle
%patch21 -p1
%patch22 -p1 -b .kio
%patch23 -p1 -b .no
%patch24 -p1 -b .libtool
%patch25 -p1 -b .redhat
%patch26 -p1 -b .xrandr
%patch27 -p1 -b .pcre
%patch28 -p1 -b .openssl
%patch30 -p1 -b .gcc33
%patch31 -p1 -b .fullscreen
%patch32 -p1 -b .flags
# security fix
%patch100 -p1 -b .kmailhandler
%patch101 -p0 -b .telnet
%patch102 -p0 -b .sec
%patch103 -p0 -b .htmlframes
%patch104 -p0 -b .kcookiejar
# add redhat into KDE_VERSION_STRING
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
%if %{redhatify}
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
%endif
%build
unset QTDIR && . /etc/profile.d/qt.sh
%if %{libtool}
make -f admin/Makefile.common cvs
make -f admin/Makefile.common cvs
%endif
# set some default FLAGS
%if %{debug}
FLAGS="-O0 -DDEBUG=1"
%else
FLAGS="$RPM_OPT_FLAGS"
FLAGS="$FLAGS -DNDEBUG -UDEBUG -DNODEBUG -UDEBUG_ASYNC_TRANSFER -UVPORT_DEBUG -UDEBUG_IO -UDEBUG_MESSAGES -UDEBUG_AUTH -UDEBUG_CONNECTION_DATA -DYYDEBUG=0 -UNETWMDEBUG -UCSS_DEBUG -UCSS_STYLESHEET_DEBUG -USPEED_DEBUG -UKJS_DEBUGGER -UFORMS_DEBUG -UDEBUG_LAYOUT -UDEBUG_DRAW_BORDER -UPARSER_DEBUG -UDECODE_DEBUG -UCACHE_DEBUG -UBUFFER_DEBUG -UJPEG_DEBUG -UDEBUG_LINEBREAKS -UBOX_DEBUG -UTABLE_DEBUG -UYYERROR_VERBOSE -UKJS_DEBUG_MEM -UMIDIOUTDEBUG -UGENERAL_DEBUG_MESSAGES"
%if %{debug}
FLAGS="-O0"
%endif
FLAGS="$FLAGS -fno-exceptions -D_GNU_SOURCE"
export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
export CFLAGS="$FLAGS"
@ -211,47 +166,53 @@ if pkg-config openssl ; then
fi
# Check which version/distribution we are...
VERSION=`cat /etc/redhat-release 2>/dev/null |awk '{ print $5; }'`
if [ -z "$VERSION" -o -z "echo $VERSION |sed -e 's,[0-9]*,,g;s,\.,,g'" ]; then
VERSION="A Red Hat Linux-based distribution"
else
VERSION="Red Hat Linux $VERSION"
fi
%if %{redhatify}
VERSION=`cat /etc/redhat-release 2>/dev/null |awk '{ print $5; }'`
if [ -z "$VERSION" -o -z "echo $VERSION |sed -e 's,[0-9]*,,g;s,\.,,g'" ]; then
VERSION="A Red Hat Linux-based distribution"
else
VERSION="Red Hat Linux $VERSION"
fi
%endif
%configure \
--with-qt-libraries=$QTDIR/lib \
--disable-rpath \
%if %{cups}
--enable-cups \
%endif
--enable-mitshm \
--with-xinerama \
%if %{redhatify}
--with-distribution="$VERSION" \
%endif
%if %{alsa}
--with-alsa \
%endif
--includedir=%{_includedir}/kde \
%if %{debug} == 0
--disable-debug \
--without-debug \
%endif
%if %{final}
--enable-final \
%endif
%if %{fam} == 0
--disable-libfam \
--without-libfam \
%endif
--with-distribution="$VERSION"
%if %{dnotify}
--enable-dnotify \
%endif
%if %{pcre}
--disable-pcre \
%endif
--disable-rpath
# ld breaks with -fPIC on ppc, workaround
# it will be removed when this bug is fixed
%ifarch ppc ppc64
perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
%endif
make %{?_smp_mflags}
make %{?smp_mflags}
make apidox
# build desktop create kde menu tool
%if %{desktop_file}
gcc $FLAGS -o desktop-create-kmenu %{SOURCE1}
%endif
%install
rm -rf $RPM_BUILD_ROOT
@ -263,8 +224,14 @@ pushd $RPM_BUILD_ROOT%{_docdir}
ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
popd
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
install -m 755 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/
# remove some mime files, which are included in openoffice
rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/vnd.sun*
# Make symlinks relative
pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en
pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
for i in *; do
if [ -d $i -a -L $i/common ]; then
rm -f $i/common
@ -273,23 +240,8 @@ for i in *; do
done
popd
%if %{desktop_file}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{menu_path}/kde
desktop-file-install \
--vendor kde \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--delete-original \
--add-category "X-KDE-Components" \
--add-only-show-in KDE \
$RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Components/*.desktop
# install desktop-create-kmenu
install -m 755 desktop-create-kmenu $RPM_BUILD_ROOT%{_bindir}
# delete unneeded files
rm -rfv $RPM_BUILD_ROOT%{_datadir}/applnk
%if %{redhatify}
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
%endif
%clean
@ -302,134 +254,126 @@ elif [ -d /etc/skel/Desktop/Autostart.rpmsave ]; then
mv -f /etc/skel/Desktop/Autostart.rpmsave /etc/skel/Desktop/Autostart-OLD..KDE
fi
/usr/sbin/adduser -c "desktop" -u 80 -s /sbin/nologin -r -d %{menu_path}/kde desktop 2>/dev/null || :
%post
/sbin/ldconfig
# create desktop files
if [ -x /usr/bin/desktop-create-kmenu ] ; then
/usr/bin/desktop-create-kmenu >& /dev/null || :
fi
%postun
/sbin/ldconfig
# delete desktop files
if [ -x /usr/bin/desktop-create-kmenu ] ; then
/usr/bin/desktop-create-kmenu >& /dev/null || :
fi
%files
%defattr(-,root,root)
%{_bindir}/dcopserver*
%{_bindir}/dcop
%{_bindir}/dcopfind
%{_bindir}/dcopclient
%{_bindir}/dcopobject
%{_bindir}/dcopref
%{_bindir}/dcopstart
%{_bindir}/kbuildsycoca
%{_bindir}/preparetips
%{_bindir}/imagetops
%{_bindir}/kcookiejar
%{_bindir}/kshell
%{_bindir}/kwrapper
%{_bindir}/kinstalltheme
%{_bindir}/kde*
%{_bindir}/kdont*
%{_bindir}/kio*
%{_bindir}/kpac_*
%{_bindir}/kaddprint*
%{_bindir}/kconf_*
%{_bindir}/klauncher
%{_bindir}/k*service
%{_bindir}/kimage_concat
%{_bindir}/lnusertemp
%{_bindir}/ksendbugmail
%{_bindir}/make*
%{_bindir}/meinproc
%{_bindir}/xml*
%{_bindir}/kdb2html
%{_bindir}/checkXML
%{_bindir}/knotify
%{_bindir}/kab2kabc
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%attr(4755,root,root) %{_bindir}/kgrantpty
/etc/profile.d/*
/etc/xdg/menus/*
%{_bindir}/artsmessage
%{_bindir}/checkXML
%{_bindir}/cupsdconf
%{_bindir}/cupsdoprint
%{_bindir}/dcop
%{_bindir}/dcopclient
%{_bindir}/dcopfind
%{_bindir}/dcopobject
%{_bindir}/dcopquit
%{_bindir}/dcopref
%{_bindir}/dcopserver
%{_bindir}/dcopserver_shutdown
%{_bindir}/dcopstart
%{_bindir}/imagetops
%{_bindir}/kab2kabc
%{_bindir}/kaddprinterwizard
%{_bindir}/kbuildsycoca
%{_bindir}/kconf_update
%{_bindir}/kconfig_compiler
%{_bindir}/kcookiejar
%{_bindir}/kde-config
%{_bindir}/kde-menu
%{_bindir}/kded
%{_bindir}/kdeinit
%{_bindir}/kdeinit_shutdown
%{_bindir}/kdeinit_wrapper
%{_bindir}/kdesu_stub
%{_bindir}/kdontchangethehostname
%{_bindir}/kfile
%{_bindir}/kfmexec
%{_bindir}/kgrantpty
%{_bindir}/kimage_concat
%{_bindir}/kinstalltheme
%{_bindir}/kio_http_cache_cleaner
%{_bindir}/kio_uiserver
%{_bindir}/kioexec
%{_bindir}/kioslave
%{_bindir}/klauncher
%{_bindir}/kmailservice
%{_bindir}/kpac_dhcp_helper
%{_bindir}/ksendbugmail
%{_bindir}/kshell
%{_bindir}/ksvgtopng
%{_libdir}/libkutils*.*
%{_libdir}/libkmediaplayer*.*
%{_libdir}/dcop*
%dir %{_libdir}/kde3
%{_libdir}/kde3/*
%{_libdir}/libDCOP*
%{_libdir}/libkabc*.*
%{_libdir}/libkate*
%{_libdir}/libkde*
%{_libdir}/libkcertpart*.*
%{_libdir}/libkhtml*.*
%{_libdir}/libkio*.*
%{_libdir}/libkjava*.*
%{_libdir}/libkjs*.*
%{_libdir}/libkparts*.*
%{_libdir}/libkscreensaver*.*
%{_libdir}/libkscript*.*
%{_libdir}/libshellscript*.*
%{_libdir}/libkspell*.*
%{_libdir}/libktexteditor*.*
%{_libdir}/libkmid*.*
%{_libdir}/libvcard*
%{_libdir}/libartskde*
%{_libdir}/k*.??
%if %{desktop_file}
%attr(755,desktop,desktop) %dir %{menu_path}
%attr(755,desktop,desktop) %dir %{menu_path}/kde
%attr(4755,root,root) %{_bindir}/desktop-create-kmenu
%{_bindir}/ktelnetservice
%{_bindir}/ktradertest
%{_bindir}/kwrapper
%{_bindir}/lnusertemp
%{_bindir}/make_driver_db_cups
%{_bindir}/make_driver_db_lpr
%{_bindir}/meinproc
%{_bindir}/preparetips
%{_libdir}/lib*
%{_libdir}/kde3
%{_datadir}/applications
%else
%{_datadir}/applnk
%endif
%dir %{_datadir}/apps
%{_datadir}/apps
%{_datadir}/locale/all_languages
%{_datadir}/apps/*
%dir %{_datadir}/config
%config(noreplace) %{_datadir}/config/*
%{_datadir}/icons
%{_datadir}/mimelnk
%{_datadir}/autostart
%dir %{_datadir}/services
%{_datadir}/services/*.kimgio
%{_datadir}/services/*.protocol
%{_datadir}/services/*.desktop
%{_datadir}/services/kded
%{_datadir}/services
%{_datadir}/servicetypes
%dir %{_docdir}/HTML
%dir %{_docdir}/HTML/en
%doc %{_docdir}/HTML/en/common
%doc %{_docdir}/HTML/en/kspell
%if %{cups}
%{_bindir}/cups*
%{_libdir}/libcups*
%endif
%files devel
%defattr(-,root,root)
%{_bindir}/dcopidl*
%{_includedir}/kde
%doc %{_docdir}/%{name}-devel-%{kde_major_version}
%doc %{_docdir}/HTML/en/kdelibs-apidocs
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
* Wed Sep 01 2004 Than Ngo <than@redhat.com> 6:3.1.4-7
- Konqueror Frame Injection Vulnerability CAN-2004-0721
- Konqueror Cross-Domain Cookie Injection CAN-2004-0746
* Wed Jan 21 2004 Than Ngo <than@redhat.com> 6:3.1.95-0.3
- fixed file conflict with hicolor-icon-theme
- added requires: hicolor-icon-theme
* Wed Jul 28 2004 Than Ngo <than@redhat.com> 6:3.1.4-6
- temporary directory vulnerability, CAN-2004-0689
* Tue Jan 20 2004 Than Ngo <than@redhat.com> 6:3.1.95-0.2
- added kde.sh, kde.csh
- fixed build problem
- fixed rpm file list
* Sun May 16 2004 Than Ngo <than@redhat.com> 6:3.1.4-5
- KDE Telnet URI Handler File Vulnerability, vulnerability in the mailto handler, CAN-2004-0411
* Mon Jan 19 2004 Than Ngo <than@redhat.com> 6:3.1.95-0.1
- KDE 3.2 RC1
* Tue Dec 02 2003 Than Ngo <than@redhat.com> 6:3.1.94-0.2
- KDE 3.2 Beta2 respin
* Mon Dec 01 2003 Than Ngo <than@redhat.com> 6:3.1.94-0.1
- KDE 3.2 Beta2
* Wed Nov 26 2003 Than Ngo <than@redhat.com> 6:3.1.93-0.4
- add missing cupsdconf, cupsdoprint and dcopquit
* Tue Nov 25 2003 Than Ngo <than@redhat.com> 6:3.1.93-0.3
- enable alsa support
* Sat Nov 08 2003 Than Ngo <than@redhat.com> 6:3.1.93-0.2
- cleanup several patch files
* Mon Nov 03 2003 Than Ngo <than@redhat.com> 6:3.1.93-0.1
- 3.2 Beta 1
- remove many patches, which are now in upstream
- adjust many redhat specific patch files
- cleanup rpm file list
* Fri Oct 17 2003 Than Ngo <than@redhat.com> 6:3.1.4-4
- fixed icon scale patch, thanks to Thomas Wörner

View File

@ -1 +1 @@
82c265de78d53c7060a09c5cb1a78942 kdelibs-3.1.4.tar.bz2
472b9e0862ae408caff2e20d417ef2df kdelibs-3.1.95.tar.bz2