diff --git a/.cvsignore b/.cvsignore index da7599c..eb09426 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -kdelibs-3.0.3.tar.bz2 +kdelibs-3.0.5a.tar.bz2 keramik-20020802.tar.bz2 diff --git a/kdelibs-3.0.4-ksyscoca.patch b/kdelibs-3.0.4-ksyscoca.patch new file mode 100644 index 0000000..55c5436 --- /dev/null +++ b/kdelibs-3.0.4-ksyscoca.patch @@ -0,0 +1,29 @@ +--- kdelibs-3.0.4/kdecore/ksycoca.cpp.ksyscoca 2002-09-09 20:25:56.000000000 -0400 ++++ kdelibs-3.0.4/kdecore/ksycoca.cpp 2002-10-10 12:16:39.000000000 -0400 +@@ -149,9 +149,15 @@ + } + + static void delete_ksycoca_self() { +- delete KSycoca::_self; ++ if (KSycoca::_checkSelf()) ++ delete KSycoca::_self; ++ + } + ++bool KSycoca::_checkSelf() { ++ return (_self ? true : false); ++} ++ + KSycoca * KSycoca::self() + { + if (!_self) { +--- kdelibs-3.0.4/kdecore/ksycoca.h.ksyscoca 2002-09-09 20:25:56.000000000 -0400 ++++ kdelibs-3.0.4/kdecore/ksycoca.h 2002-10-10 11:54:28.000000000 -0400 +@@ -63,6 +63,7 @@ + * Get or create the only instance of KSycoca (read-only) + */ + static KSycoca *self(); ++ static bool _checkSelf(); + + virtual ~KSycoca(); + diff --git a/kdelibs.spec b/kdelibs.spec index 3b1d4b0..3c8aa5a 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,45 +1,77 @@ -%define kde_major_version 3 -%define is_release 1 -%define beta %{nil} -%define cups cups -%define rel 8.3 +%define build_release 0 +%define build_beta 1 +%define build_snapshot 2 + +%define isClean 1 + +%define isBuild %{build_release} + %define debug 0 -%define DATE 20020802 -Version: 3.0.3 -%define ver %{version}%{beta} + +%define release_number 1 + +%define build_for_ftp 0 + +%define cups 1 + +%define libtool 1 + +Version: 3.0.5a Summary: K Desktop Environment - Libraries -Url: http://ww.kde.org -%if %{is_release} -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{ver}.tar.bz2 -%else -Source: cvs://cvs.kde.org/%{name}-%{DATE}.tar.bz2 +Name: kdelibs +Url: http://www.kde.org/ +Icon: kde-icon.xpm +Epoch: 6 +Group: System Environment/Libraries +License: LGPL +BuildRoot: %{_tmppath}/%{name}-buildroot + +%if "%{isBuild}" == "%{build_release}" +%define release_name %{nil} +Release: %{release_number} +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{version}.tar.bz2 %endif -Source1: keramik-%{DATE}.tar.bz2 + +%if "%{isBuild}" == "%{build_beta}" +%define release_name beta1 +Release: 0.%{release_name}.%{release_number} +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{release_name}.tar.bz2 +%endif + +%if "%{isBuild}" == "%{build_snapshot}" +%define release_name 20020807 +Release: 0.%{release_name}cvs.%{release_number} +Source: cvs://cvs.kde.org/%{name}-%{release_name}.tar.bz2 +%endif + +Source1: keramik-20020802.tar.bz2 + 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-ksyscoca.patch +Patch9: kdelibs-3.0.4-ksyscoca.patch Patch11: kdelibs-2.1.1-path.patch Patch12: kdelibs-3.0-rpath.patch Patch13: kdelibs-3.0.2-dock.patch Patch15: kdelibs-3.0.2-alignment.patch Patch16: kdelibs-3.0.2-katetextbuffermultibyte.patch Patch17: kdelibs-3.0.3-lang.patch -Patch18: kdelibs-3.0.3-dtfix.patch Patch19: kdelibs-3.0.3-redhat.patch -Patch20: post-3.0.3-kdelibs-khtml.diff -Patch21: post-3.0.4-kdelibs-kio-misc.diff +Patch21: kdelibs-3.0.4-dtfix.patch +Patch22: kdelibs-3.0.3-lib64.patch +Patch23: kioslavetest.patch +Patch24: metatest.patch -Name: kdelibs Requires: qt >= 3.0.5 Requires: arts >= 7:1.0.2 -%if "%{cups}" != "" + +%if %{cups} Requires: cups-libs >= 1.1.12 BuildRequires: cups-devel >= 1.1.12 %endif -BuildRequires: qt-devel >= 3.0.5 -Obsoletes: %{name}2 + +BuildPrereq: qt-devel >= 3.0.5 BuildPrereq: flex >= 2.5.4a-13 BuildPrereq: kdoc >= 3.0.0 BuildPrereq: libxslt-devel >= 1.0.9 @@ -55,22 +87,17 @@ BuildPrereq: zlib-devel BuildPrereq: arts-devel >= 7:1.0.2 BuildPrereq: audiofile-devel BuildPrereq: openssl-devel -Icon: kde-icon.xpm -Epoch: 6 -%if %{is_release} -%if "%{beta}" != "" -Release: 0.%{beta}.%{rel} -%else -Release: %{rel} -%endif -%else -Release: 0.cvs%{DATE}.%{rel} -%endif -Group: System Environment/Libraries -License: LGPL -BuildRoot: %{_tmppath}/%{name}-buildroot +BuildPrereq: perl + +Prereq: /sbin/ldconfig + +Obsoletes: %{name}2 Obsoletes: kdesupport +%if %{build_for_ftp} +ExclusiveArch: %ix86 +%endif + %description Libraries for the K Desktop Environment: KDE Libraries included: kdecore (KDE core library), kdeui (user interface), @@ -81,7 +108,9 @@ kimgio (image manipulation). %package devel Group: Development/Libraries Summary: Header files and documentation for compiling KDE applications. -Requires: qt-devel >= 3.0.5, %{name} = %{version}, pcre-devel +Requires: qt-devel >= 3.0.5 +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: pcre-devel Obsoletes: kdesupport-devel %description devel @@ -90,12 +119,10 @@ applications for KDE. Also included is the KDE API documentation in HTML format for easy browsing. %prep -rm -rf $RPM_BUILD_ROOT - -%if %{is_release} -%setup -q -n %{name}-%{ver} -a 1 +%if "%{isBuild}" == "%{build_release}" +%setup -q -a 1 %else -%setup -q -n %{name} -a 1 +%setup -q -n %{name}-%{version}-%{release_name} -a 1 %endif %patch12 -p1 -b .rpath @@ -111,103 +138,105 @@ rm -rf $RPM_BUILD_ROOT %patch15 -p1 -b .alignment %patch16 -p1 -b .buffermultibyte %patch17 -p1 -b .lang -%patch18 -p1 -b .dtfix %patch19 -p1 -b .menu -pushd khtml -%patch20 -p0 -b .securiy -popd -%patch21 -p1 -b .rlogin +%patch21 -p1 -b .dtfix +%patch22 -p1 -b .lib64 +%patch23 -p0 +%patch24 -p0 # 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} Red Hat\"," kdecore/kdeversion.h +# Workaround for legacy auto* tools +%if %{libtool} 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 + 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 +make -f admin/Makefile.common cvs +%endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh %if %{debug} -export FLAGS="-O0 -DDEBUG=1" +FLAGS="-O0 -DDEBUG=1" %else -# FIXME: Workaround for bug #57502 -%ifarch ia64 -export FLAGS="-O0" -%else -export FLAGS="$RPM_OPT_FLAGS" -%endif -export 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" +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" %endif -export FLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions -fno-check-new $FLAGS -D_GNU_SOURCE" +FLAGS="$FLAGS -fno-exceptions -D_GNU_SOURCE" + +export CXXFLAGS="$FLAGS -fno-use-cxa-atexit" +export CFLAGS="$FLAGS" # 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" + VERSION="A Red Hat Linux-based distribution" else - VERSION="Red Hat Linux $VERSION" + VERSION="Red Hat Linux $VERSION" fi -CXXFLAGS="$FLAGS" CFLAGS="$FLAGS" ./configure \ - --prefix=%{_prefix} \ -%if "%{cups}" != "" - --enable-cups \ +%configure \ + --disable-rpath \ +%if %{cups} + --enable-cups \ %endif - --enable-mitshm \ - --with-xinerama \ - --includedir=%{_includedir}/kde \ + --enable-mitshm \ + --with-xinerama \ + --includedir=%{_includedir}/kde \ %if "%{debug}" == "0" - --disable-debug \ - --without-debug \ - --enable-final \ + --disable-debug \ + --without-debug \ + --enable-final \ %endif - --with-distribution="$VERSION" \ - --disable-libfam --without-libfam + --with-distribution="$VERSION" \ + --disable-libfam \ + --without-libfam -%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-strip +rm -rf $RPM_BUILD_ROOT + +make DESTDIR=$RPM_BUILD_ROOT install chmod a+x $RPM_BUILD_ROOT%{_libdir}/* # Generate documentation export PATH=$RPM_BUILD_ROOT/%{_bindir}:$PATH +unset QTDIR || : ; . /etc/profile.d/qt.sh makekdedoc=`which makekdedoc` if [ ! -z "$makekdedoc" ]; then - url=%{_docdir}/%{name}-devel-%{version} - kdocdir=$RPM_BUILD_ROOT$url - mkdir -p $kdocdir - qt2kdoc=`which qt2kdoc` - 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 + url=%{_docdir}/%{name}-devel-%{version} + kdocdir=$RPM_BUILD_ROOT$url + mkdir -p $kdocdir + qt2kdoc=`which qt2kdoc` + 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 fi -( cd $RPM_BUILD_ROOT%{_docdir} - ln -sf %{name}-devel-%{version} %{name}-devel-%{kde_major_version} ) +pushd $RPM_BUILD_ROOT%{_docdir} +ln -sf %{name}-devel-%{version} %{name}-devel-%{kde_major_version} +popd # Make symlinks relative pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../common $i - fi + if [ -d $i -a -L $i/common ]; then + rm -f $i/common + ln -sf ../common $i + fi done popd @@ -215,7 +244,9 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version} install -m 644 KDE2PORTING.html $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version} %clean +%if %{isClean} rm -rf $RPM_BUILD_ROOT +%endif %post -p /sbin/ldconfig @@ -293,7 +324,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/services/kded %{_datadir}/servicetypes %doc %{_datadir}/doc/HTML/* -%if "%{cups}" != "" +%if %{cups} %{_bindir}/cups* %{_libdir}/libcups* %endif @@ -307,13 +338,32 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-devel-%{version}/* %changelog -* Wed Nov 13 2002 Than Ngo 3.0.3-8.3 -- A vulnerability in the rlogin KIO subsystem +* Sun Dec 22 2002 Than Ngo 3.0.5a-1 +- update to 3.0.5a +- fix dependency issue (bug #79184) -* Sat Oct 12 2002 Than Ngo 3.0.3-8.2 +* Sat Nov 9 2002 Than Ngo 3.0.5-1 +- update to 3.0.5 + +* Wed Oct 16 2002 Than Ngo 3.0.4-3 +- rebuild to get rid of libstdc++.la on x86_64 +- cleanup sepcfile +- dependency issue + +* Sat Oct 12 2002 Than Ngo 3.0.4-2 - better handling of desktop file renames (bug #74071) - initLanguage issue +* Thu Oct 10 2002 Than Ngo 3.0.4-1 + +- 3.0.4 +- Added 2 patch files for built-in tests from AndreyPozdeev@rambler.ru (bug #75003) +- Added KDE Url (bug #54592) + +* Tue Oct 8 2002 Than Ngo 3.0.3-10 +- Added fix to get correct Lib directory name on 64bit machine +- New fix to handle desktop file renames (bug #74071) + * Fri Sep 20 2002 Than Ngo 3.0.3-8.1 - Konqueror Cross Site Scripting Vulnerability diff --git a/sources b/sources index 4299efb..9a3f584 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f26acfafbd3a00451b6e344a7d75386d kdelibs-3.0.3.tar.bz2 +a3c714c7727ddc70e7c9ea6acf5e42dc kdelibs-3.0.5a.tar.bz2 a99d8ad700ad55e49eba452d3bf7d5e2 keramik-20020802.tar.bz2