diff --git a/.cvsignore b/.cvsignore index eb09426..09d4c35 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -kdelibs-3.0.5a.tar.bz2 -keramik-20020802.tar.bz2 +kdelibs-3.1.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index 9299ca2..7b98fb0 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,3 +1,6 @@ +%define _missing_doc_files_terminate_build 0 +%define _unpackaged_files_terminate_build 0 + %define build_release 0 %define build_beta 1 %define build_snapshot 2 @@ -8,17 +11,32 @@ %define debug 0 -%define release_number 5 +%define release_number 0.2 %define build_for_ftp 0 %define cups 1 -%define kde_major_version 3 +%define qtversion 3.1.0 + +%define desktop_file 1 +%define desktop_file_utils_version 0.2.93 -%define libtool 1 +%define libtool 0 -Version: 3.0.5a +%if %{desktop_file} +Requires: desktop-backgrounds-basic +Requires: redhat-menus => 0.26 +Requires: redhat-artwork >= 0.49 +Prereq: fileutils +Prereq: desktop-file-utils >= %{desktop_file_utils_version} +%endif + +%if %{build_for_ftp} +ExclusiveArch: %{ix86} +%endif + +Version: 3.1 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -46,42 +64,33 @@ 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.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 -Patch19: kdelibs-3.0.3-redhat.patch -Patch21: kdelibs-3.0.4-dtfix.patch -Patch22: kdelibs-3.0.3-lib64.patch -Patch23: kioslavetest.patch -Patch24: metatest.patch -Patch25: kdelibs-3.0.5a-buildroot.patch -Patch26: kdelibs-3.0.5a-gnome-menu.patch -Patch27: post-3.0.5a-kdelibs-kimgio.diff -Patch28: post-3.0.5b-kdelibs-khtml.patch -Patch29: post-3.0.5b-kdelibs-http.patch - - -Requires: qt >= 3.0.5 -Requires: arts >= 7:1.0.2 +Patch1: kdelibs-3.0-noxs.patch +Patch2: kdelibs-3.0.0-ndebug.patch +Patch3: kdelibs-3.1-resize-icons.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.0.3-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-pic.patch + +Requires: qt >= %{qtversion} +Requires: arts >= 7:1.1.0 %if %{cups} Requires: cups-libs >= 1.1.12 BuildRequires: cups-devel >= 1.1.12 %endif -BuildPrereq: qt-devel >= 3.0.5 +BuildPrereq: qt-devel >= %{qtversion} BuildPrereq: flex >= 2.5.4a-13 -BuildPrereq: kdoc >= 3.0.0 +BuildPrereq: doxygen BuildPrereq: libxslt-devel >= 1.0.9 BuildPrereq: sgml-common BuildPrereq: openjade @@ -92,20 +101,18 @@ BuildPrereq: perl-SGMLSpm BuildPrereq: docbook-utils BuildPrereq: pcre-devel BuildPrereq: zlib-devel -BuildPrereq: arts-devel >= 7:1.0.2 +BuildPrereq: arts-devel >= 7:1.1.0 BuildPrereq: audiofile-devel BuildPrereq: openssl-devel BuildPrereq: perl +BuildPrereq: gawk +BuildPrereq: byacc 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), @@ -116,8 +123,8 @@ kimgio (image manipulation). %package devel Group: Development/Libraries Summary: Header files and documentation for compiling KDE applications. -Requires: qt-devel >= 3.0.5 -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: qt-devel >= %{qtversion} +Requires: %{name} = %{version} Requires: pcre-devel Obsoletes: kdesupport-devel @@ -127,69 +134,54 @@ applications for KDE. Also included is the KDE API documentation in HTML format for easy browsing. %prep +rm -rf $RPM_BUILD_ROOT + %if "%{isBuild}" == "%{build_release}" -%setup -q -a 1 +%setup -q %else -%setup -q -n %{name}-%{version}-%{release_name} -a 1 +%setup -q -n %{name}-%{version}-%{release_name} %endif -%patch12 -p1 -b .rpath -%patch3 -p0 -b .icon +%patch1 -p1 -b .noxs %if %{debug} == 0 -%patch7 -p1 -b .debug +%patch2 -p1 -b .debug %endif -%patch6 -p1 -b .noxs -%patch8 -p1 -b .resize -%patch9 -p1 -b .ksyscoca -%patch11 -p1 -b .path -%patch13 -p1 -b .dock -%patch15 -p1 -b .alignment -%patch16 -p1 -b .buffermultibyte -%patch17 -p1 -b .lang -%patch19 -p1 -b .menu -%patch21 -p1 -b .dtfix -%patch22 -p1 -b .lib64 -%patch23 -p0 -%patch24 -p0 -%patch25 -p1 -b .buildroot -%patch26 -p1 -b .watchdirs - -pushd kimgio -%patch27 -p0 -b .pdf -popd +%patch3 -p1 -b .resize +%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 .pics -pushd khtml -%patch28 -p0 -b .sec -popd - -pushd kioslave/http -%patch29 -p0 -b .sec -popd - -# 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} +# Workaround for legacy auto* tools 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 admin/Makefile.common cvs +make -f Makefile.cvs %endif %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR +. /etc/profile.d/qt.sh +# 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" %endif - FLAGS="$FLAGS -fno-exceptions -D_GNU_SOURCE" export CXXFLAGS="$FLAGS -fno-use-cxa-atexit" @@ -203,7 +195,10 @@ else VERSION="Red Hat Linux $VERSION" fi -%configure \ +./configure \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --with-qt-libraries=$QTDIR/lib \ --disable-rpath \ %if %{cups} --enable-cups \ @@ -222,32 +217,18 @@ fi make %{?_smp_mflags} -%install -rm -rf $RPM_BUILD_ROOT +doxygen Doxyfile +%install +export DESTDIR=$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 -fi - +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version} +cp -aR apidocs/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version} +install -m 644 KDE2PORTING.html $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version} pushd $RPM_BUILD_ROOT%{_docdir} ln -sf %{name}-devel-%{version} %{name}-devel-%{kde_major_version} popd @@ -262,8 +243,15 @@ for i in *; do done popd -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version} -install -m 644 KDE2PORTING.html $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version} +%if %{desktop_file} +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 +%endif %clean %if %{isClean} @@ -309,6 +297,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/knotify %{_bindir}/kab2kabc %{_bindir}/artsmessage +%{_bindir}/kfile +%{_bindir}/ksvgtopng +%{_libdir}/libkutils*.* +%{_libdir}/libkmediaplayer*.* %{_libdir}/dcop* %dir %{_libdir}/kde3 %{_libdir}/kde3/* @@ -331,8 +323,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libvcard* %{_libdir}/libartskde* %{_libdir}/k*.?? - +%if %{desktop_file} +%{_datadir}/applications +%else +%{_datadir}/applnk +%endif %dir %{_datadir}/apps +%{_datadir}/locale/all_languages %{_datadir}/apps/* %dir %{_datadir}/config %config(noreplace) %{_datadir}/config/* @@ -360,22 +357,16 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-devel-%{version}/* %changelog -* Mon Jul 14 2003 Than Ngo 3.0.5a-5 -- securitiy bug - Konqueror Referer Leaking Website Authentication Credentials - -* Mon Apr 7 2003 Than Ngo 3.0.5a-4 -- PS/PDF file handling vulnerability - -* Wed Mar 5 2003 Than Ngo 3.0.5a-3 -- watch /usr/share/applications for changes, (bug #71613) +* Fri Nov 22 2002 Than Ngo 3.1-0.2 +- use doxygen to create api docs -* Tue Dec 24 2002 Than Ngo 3.0.5a-2 -- fix bug #78646 -- set kde_major_version +* Tue Nov 19 2002 Than Ngo 3.1-0.1 +- update rc4 +- adjust many patch files for 3.1 +- remove some patch files, which are now in 3.1 -* Sun Dec 22 2002 Than Ngo 3.0.5a-1 -- update to 3.0.5a -- fix dependency issue (bug #79184) +* Sun Nov 10 2002 Than Ngo 3.0.5-1.1 +- conform strict ANSI (bug #77603) * Sat Nov 9 2002 Than Ngo 3.0.5-1 - update to 3.0.5 diff --git a/sources b/sources index 9a3f584..0e1e6b3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a3c714c7727ddc70e7c9ea6acf5e42dc kdelibs-3.0.5a.tar.bz2 -a99d8ad700ad55e49eba452d3bf7d5e2 keramik-20020802.tar.bz2 +5864d2650f772bee3e3efaa9b3114438 kdelibs-3.1.tar.bz2