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

- more patches from CVS stable branch 

- add missing kde documents, workaround for rpm bug
This commit is contained in:
Than Ngo 2005-04-01 18:19:28 +00:00
parent 21f4c60542
commit ae8e2fb21a
2 changed files with 38 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kdelibs-3.4.0-qtdoc.patch Normal file
View File

@ -0,0 +1,11 @@
--- kdelibs-3.4.0/admin/acinclude.m4.in.orig 2005-04-01 19:01:33.000000000 +0200
+++ kdelibs-3.4.0/admin/acinclude.m4.in 2005-04-01 19:03:15.000000000 +0200
@@ -5317,7 +5317,7 @@
kde_qtdir="$with_qt_dir"
fi
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDOC/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)

92
kdelibs.spec
View File

@ -3,10 +3,16 @@
%define debug 0
%define final 0
%define qt_epoch 1
%define arts_epoch 8
%define cups_epoch 1
%define qt_version 3.3.4
%define arts_version 1.4.0
%define kde_major_version 3
%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
%define make_cvs 1
%define fam 1
%define dnotify 1
@ -16,7 +22,7 @@
%define arts 1
Version: 3.4.0
Release: 1
Release: 2
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@ -28,6 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: kde.sh
Source2: kde.csh
Source3: kde-applications.menu
Patch1: kdelibs-3.2.2-pie.patch
Patch2: kdelibs-3.0.0-ndebug.patch
@ -41,15 +48,16 @@ Patch20: kdelibs-3.3.92-defaultstyle.patch
Patch24: kdelibs-3.1-libtool.patch
Patch32: kdelibs-3.2.3-cups.patch
Patch33: kdelibs-3.3.2-ppc.patch
Patch34: kdelibs-3.4.0-qtdoc.patch
# gcc4 workaround
Patch200: admin-visibility.patch
%if %{arts}
Requires: arts >= 8:%{arts_version}
Requires: arts >= %{arts_epoch}:%{arts_version}
%endif
Requires: qt >= 1:%{qt_version}
Requires: cups-libs >= 1:1.1.12
Requires: qt >= %{qt_epoch}:%{qt_version}
Requires: cups-libs >= %{cups_epoch}:1.1.12
%if %{redhatify}
Requires: desktop-backgrounds-basic
@ -71,8 +79,8 @@ BuildRequires: fam-devel
BuildRequires: pcre-devel
%endif
BuildRequires: cups-devel >= 1:1.1.20
BuildRequires: qt-devel >= 1:%{qt_version}
BuildRequires: cups-devel >= %{cups_epoch}:1.1.20
BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
BuildRequires: flex >= 2.5.4a-13
BuildRequires: doxygen
BuildRequires: libxslt-devel >= 1.1.2
@ -86,7 +94,7 @@ BuildRequires: docbook-utils
BuildRequires: zlib-devel
BuildRequires: libidn-devel
%if %{arts}
BuildRequires: arts-devel >= 8:%{arts_version}
BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}
%endif
BuildRequires: audiofile-devel
BuildRequires: openssl-devel
@ -115,7 +123,7 @@ kimgio (image manipulation).
%package devel
Group: Development/Libraries
Summary: Header files and documentation for compiling KDE applications.
Requires: qt-devel >= 1:%{qt_version}
Requires: qt-devel >= %{qt_epoch}:%{qt_version}
Requires: %{name} = %{epoch}:%{version}-%{release}
%if %{arts}
Requires: arts-devel
@ -159,6 +167,7 @@ format for easy browsing.
%patch24 -p1 -b .libtool
%patch32 -p1 -b .cups
%patch33 -p1 -b .ppc
%patch34 -p1 -b .qtdoc
%patch200 -p1 -b .gcc4
# add redhat into KDE_VERSION_STRING
@ -167,6 +176,7 @@ format for easy browsing.
%endif
%build
export QTDOC=%{qtdocdir}
unset QTDIR && . /etc/profile.d/qt.sh
%if %{make_cvs}
@ -313,6 +323,7 @@ popd
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
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xdg/menus/
echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
%endif
@ -333,65 +344,12 @@ exit 0
%files
%defattr(-,root,root)
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%attr(4755,root,root) %{_bindir}/kgrantpty
/etc/profile.d/*
/etc/xdg/menus/*
%{_bindir}/kcmshell
%{_bindir}/fileshareset
%{_bindir}/khotnewstuff
%{_bindir}/makekdewidgets
%if %{arts}
%{_bindir}/artsmessage
%endif
%{_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}/kimage_concat
%{_bindir}/kinstalltheme
%{_bindir}/kio_http_cache_cleaner
%{_bindir}/kio_uiserver
%{_bindir}/kioexec
%{_bindir}/kioslave
%{_bindir}/klauncher
%{_bindir}/kmailservice
%{_bindir}/ksendbugmail
%{_bindir}/kshell
%{_bindir}/ksvgtopng
%{_bindir}/ktelnetservice
%{_bindir}/ktradertest
%{_bindir}/kwrapper
%{_bindir}/lnusertemp
%{_bindir}/make_driver_db_cups
%{_bindir}/make_driver_db_lpr
%{_bindir}/meinproc
%{_bindir}/preparetips
%{_bindir}/*
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%attr(4755,root,root) %{_bindir}/kgrantpty
%exclude %{_bindir}/dcopidl*
%{_libdir}/lib*
%{_libdir}/kde3
%{_datadir}/applications
@ -418,6 +376,10 @@ exit 0
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
* Fri Apr 01 2005 Than Ngo <than@redhat.com> 6:3.4.0-2
- more patches from CVS stable branch
- add missing kde documents, workaround for rpm bug
* Thu Mar 17 2005 Than Ngo <than@redhat.com> 6:3.4.0-1
- 3.4.0 release