rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

auto-import kdelibs-3.0.3-1 from kdelibs-3.0.3-1.src.rpm

This commit is contained in:
cvsdist 2004-09-09 06:55:48 +00:00
parent 4bebfe1ca6
commit efd2858919
3 changed files with 96 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,2 +1,2 @@
kdelibs-3.0.3.tar.bz2
keramik-20020327.tar.bz2
keramik-20020802.tar.bz2

176
kdelibs.spec
View File

@ -2,44 +2,44 @@
%define is_release 1
%define beta %{nil}
%define cups cups
%define rel 0.7.2
%define rel 1
%define debug 0
%define DATE 20020327
%define DATE 20020802
Version: 3.0.3
%define ver %{version}%{beta}
Summary: K Desktop Environment - Libraries
%if %{is_release}
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{ver}.tar.bz2
Source1: keramik-%{DATE}.tar.bz2
%else
Source: cvs://cvs.kde.org/%{name}-%{DATE}.tar.bz2
%endif
Source1: keramik-%{DATE}.tar.bz2
Patch: kdelibs-3.0-dlopen-gcc31.patch
Patch1: kdelibs-3.0.0-keramik.patch
Patch2: kdelibs-3.0.0-i18nfix.patch
Patch3: kdelibs-3.1-iconthemes.patch
Patch6: kdelibs-3.0-noxs.patch
Patch7: kdelibs-3.0.0-ndebug.patch
Patch8: kdelibs-3.0-resize-icons.patch
Patch9: kdelibs-3.0.2-katetextbuffermultibyte.patch
Patch9: kdelibs-3.0.2-ksyscoca.patch
Patch11: kdelibs-2.1.1-path.patch
Patch12: kdelibs-3.0.2-ksyscoca.patch
Patch13: kdelibs-3.0-rpath.patch
Patch14: post-3.0.3-kdelibs-khtml.diff
Patch15: kdelibs-3.0.3-alignment.patch
Patch16: post-3.0.4-kdelibs-kio-misc.diff
Patch12: kdelibs-3.0-rpath.patch
Patch13: kdelibs-3.0.2-dock.patch
Patch14: kdelibs-3.0.2-aboutkde.patch
Patch15: kdelibs-3.0.2-alignment.patch
# Japanese patches
Patch101: http://www.kde.gr.jp/patch/kdelibs-2.2.2-khtml-autoencode-ja-20011126.diff
Name: kdelibs
Requires: qt >= 3.0.3
Requires: arts >= 7:1.0.2-1
Requires: qt >= 3.0.3 arts >= 7:1.0.2
%if "%{cups}" != ""
Requires: cups-libs >= 1.1.12
BuildRequires: cups-devel >= 1.1.12
%endif
BuildRequires: qt-devel >= 3.0.5
Obsoletes: %{name}2 kdelibs-sound
BuildRequires: qt-devel >= 3.0.3
Obsoletes: %{name}2
BuildPrereq: flex >= 2.5.4a-13 kdoc >= 3.0.0 libxslt-devel >= 1.0.9
BuildPrereq: sgml-common openjade jadetex docbook-dtd31-sgml docbook-style-dsssl perl-SGMLSpm docbook-utils pcre-devel zlib-devel arts-devel >= 7:1.0.2
BuildPrereq: sgml-common openjade jadetex docbook-dtd31-sgml
BuildPrereq: docbook-style-dsssl perl-SGMLSpm docbook-utils pcre-devel
BuildPrereq: zlib-devel arts-devel >= 7:1.0.2
BuildPrereq: audiofile-devel
BuildPrereq: openssl-devel
Icon: kde-icon.xpm
@ -57,8 +57,6 @@ Group: System Environment/Libraries
License: LGPL
BuildRoot: %{_tmppath}/%{name}-buildroot
Obsoletes: kdesupport
Source900: gccver.c
Provides: libartskde.so.1 libDCOP.so.4 libkabc.so.1 libkatepartinterfaces.so.0 libkdecore.so.4 libkdefakes.so.4 libkdefx.so.4 libkdeprint_management.so.4 libkdeprint.so.4 libkdesasl.so.1 libkdesu.so.4 libkdeui.so.4 libkhtml.so.4 libkio.so.4 libkjava.so.1 libkjs.so.1 libkmid.so.0 libkparts.so.2 libkscreensaver.so.4 libkscript.so.0 libkspell.so.4 libktexteditor.so.0 libshellscript.so.0 libvcard.so.0
%description
Libraries for the K Desktop Environment:
@ -84,41 +82,38 @@ rm -rf $RPM_BUILD_ROOT
%if %{is_release}
%setup -q -n %{name}-%{ver} -a 1
%else
%setup -q -n %{name}
%setup -q -n %{name} -a 1
%endif
%patch13 -p1 -b .rpath
%patch12 -p1 -b .rpath
%patch -p1 -b .gcc31dlopen
# %patch1 -p1 -b .styles
%patch2 -p1 -b .i18n
%patch3 -p0 -b .icon
%if %{debug} == 0
%patch7 -p1 -b .debug
%endif
%patch6 -p1 -b .noxs
%patch8 -p1 -b .resize
%patch9 -p1 -b .buffermultibyte
%patch9 -p1 -b .ksyscoca
%patch11 -p1 -b .path
%patch12 -p1 -b .ksyscoca
pushd khtml
%patch14 -p0 -b .securiy
popd
%patch15 -p1 -b .aligment
%patch16 -p1 -b .rlogin
%patch13 -p1 -b .dock
%patch14 -p1 -b .aboutkde
%patch15 -p1 -b .alignment
# Enable keramik
perl -pi -e "s,highcolor,highcolor keramik," kstyles/Makefile.am
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release}\"," kdecore/kdeversion.h
# # # patch101 -p1 -b .jp2
# Workaround for legacy auto* tools
[ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
[ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader
[ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal
[ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake
export PATH=`pwd`:$PATH
# End workaround
make -f Makefile.cvs || :
if [ -e /usr/bin/automake-1.5 ]; then
ln -s /usr/bin/automake-1.5 automake
ln -s /usr/bin/aclocal-1.5 aclocal
export PATH=`pwd`:$PATH
fi
make -f Makefile.cvs
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@ -159,22 +154,18 @@ CXXFLAGS="$FLAGS" CFLAGS="$FLAGS" ./configure \
--enable-final \
%endif
--with-distribution="$VERSION" \
%ifarch %{ix86}
--enable-fast-malloc=yes \
%endif
--disable-libfam --without-libfam
gcc -o gccver %{SOURCE900}
if [ "0`./gccver`" -lt 3001 ]; then
find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g"
fi
%ifnarch ia64
make %{?_smp_mflags}
%else
make
%endif
%install
unset QTDIR || : ; . /etc/profile.d/qt.sh
export DESTDIR=$RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install-strip
chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
@ -189,10 +180,12 @@ if [ ! -z "$makekdedoc" ]; then
if [ ! -z "$qt2kdoc" ]; then
$qt2kdoc -z -o $kdocdir/kdoc-reference $QTDIR/doc/html
fi
$makekdedoc -p'--skip-internal' --srcdir . --libdir $kdocdir/kdoc-reference --outputdir $kdocdir --url $url
$makekdedoc -p'--skip-internal' --srcdir . --libdir $kdocdir/kdoc-reference \
--outputdir $kdocdir --url $url
fi
( cd $RPM_BUILD_ROOT%{_docdir} && ln -sf %{name}-devel-%{version} %{name}-devel-%{kde_major_version} )
( cd $RPM_BUILD_ROOT%{_docdir}
ln -sf %{name}-devel-%{version} %{name}-devel-%{kde_major_version} )
# Make symlinks relative
pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en
@ -207,30 +200,6 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
install -m 644 KDE2PORTING.html $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
# Set symlinks for files we renamed because of compiler ABI issues
if [ "0`./gccver`" -lt 3001 ]; then
REL="gcc`./gccver -v`"
solink() {
sover=$1
somajor=`echo $sover |sed -e "s,\..*,,"`
shift
for i in $@; do
if [ -e $RPM_BUILD_ROOT/%{_libdir}/lib${i}-${REL}.so ]; then
ln -s lib${i}-${REL}.so $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${sover}
ln -s lib${i}-${REL}.so $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${somajor}
elif [ -e $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.? ]; then
ln -s `basename $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.?` $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${sover}
ln -s `basename $RPM_BUILD_ROOT%{_libdir}/lib${i}-${REL}.so.?` $RPM_BUILD_ROOT/%{_libdir}/lib${i}.so.${somajor}
fi
done
}
solink 0.0.0 katepartinterfaces kscript ktexteditor shellscript vcard
solink 0.0.95 kmid
solink 1.0.0 artskde kabc kdesasl kjava kjs
solink 2.0.0 kparts
solink 4.0.0 DCOP kdecore kdefakes kdefx kdeprint kdeprint_management kdesu kdeui khtml kio kscreensaver kspell
fi
%clean
rm -rf $RPM_BUILD_ROOT
@ -324,19 +293,60 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-devel-%{version}/*
%changelog
* Wed Nov 13 2002 Than Ngo <than@redhat.com> 3.0.3-0.7.2
- A vulnerability in the rlogin KIO subsystem
* Mon Sep 30 2002 Than Ngo <than@redhat.com> 3.0.3-0.7.1
- Konqueror SSL vulnerability
- Secure Cookie Vulnerability
- Konqueror Cross Site Scripting Vulnerability
- Fixed a bug in ktip
- Added ksyscoca patch from Harald Hoyer
- Added katetextbuffermultibyte patch from Leon Ho (bug #61464)
* Mon Aug 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-0.7
* Sun Aug 11 2002 Than Ngo <than@redhat.com> 3.0.3-1
- 3.0.3
- Added ksyscoca patch from Harald Hoyer
* Thu Aug 8 2002 Than Ngo <than@redhat.com> 3.0.2-6
- Added better system tray dock patch from Harald Hoyer
* Fri Aug 2 2002 Than Ngo <than@redhat.com> 3.0.2-5
- Fixed a bug in ktip (bug #69627,70329)
* Fri Aug 2 2002 Than Ngo <than@redhat.com> 3.0.2-4
- Added system tray dock patch from Harald Hoyer
- Added Buildrequires audiofile-devel (bug #69983)
- Added Buildrequires openssl-devel (bug #64858)
- Rebuild against qt 3.0.5 (bug #70379)
- Added patch to remove "about KDE" menu item from help menu (bug #67287)
- Fixed dependencies bug by update (bug #69798)
- Added some bugfixes from 3.0.2 stable branches
* Fri Aug 2 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-3
- Add some bugfixes from CVS (mostly HTML rendering fixes)
* Mon Jul 22 2002 Tim Powers <timp@redhat.com> 3.0.2-2
- rebuild using gcc-3.2-0.1
* Tue Jul 2 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-1
- 3.0.2
* Tue Jun 25 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020625.1
- Make KLocale respect the LANG setting when kpersonalizer wasn't run
* Mon Jun 24 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020624.1
- Update, should be VERY close to 3.0.2 final now.
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu Jun 20 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020620.1
- Update
- Remove the malloc hack, it's no longer needed with glibc 2.2.90
* Tue May 28 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-3
- Add support for xdg-list icon theme spec
* Fri May 9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-1
- 3.0.1
* Wed May 7 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-12
- Update to KDE_3_0_BRANCH
- Do away with the GCC296 define, it's handled automatically
* Thu May 2 2002 Than Ngo <than@redhat.com> 3.0.0-11
- add some fixes from KDE CVS
- build against gcc-3.1-0.26/qt-3.0.3-12
* Mon Apr 15 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-10
- Change sonames to something indicating the compiler version if a compiler

4
sources
View File

@ -1,2 +1,2 @@
f26acfafbd3a00451b6e344a7d75386d kdelibs-3.0.3.tar.bz2
47b658735b0590ae7ae5f884fbda789e keramik-20020327.tar.bz2
c2dd86e1214020b634d37f46dff82d86 kdelibs-3.0.3.tar.bz2
a99d8ad700ad55e49eba452d3bf7d5e2 keramik-20020802.tar.bz2