- apply patch to fix a printing problem

- add subpackage kdelibs-docs
- enable --enable-new-ldflags #161074
This commit is contained in:
Than Ngo 2006-01-18 15:41:35 +00:00
parent 57a813f786
commit 7fe5209365
1 changed files with 29 additions and 11 deletions

View File

@ -1,7 +1,7 @@
%define redhatify 1 %define redhatify 1
%define debug 0 %define debug 0
%define final 0 %define final 1
%define qt_epoch 1 %define qt_epoch 1
%define arts_epoch 8 %define arts_epoch 8
@ -24,7 +24,7 @@
%define disable_gcc_check_and_hidden_visibility 1 %define disable_gcc_check_and_hidden_visibility 1
Version: 3.5.0 Version: 3.5.0
Release: 4 Release: 5
Summary: K Desktop Environment - Libraries Summary: K Desktop Environment - Libraries
Name: kdelibs Name: kdelibs
Url: http://www.kde.org/ Url: http://www.kde.org/
@ -54,6 +54,7 @@ Patch34: kdelibs-3.4.0-qtdoc.patch
Patch35: kdelibs-3.4.92-inttype.patch Patch35: kdelibs-3.4.92-inttype.patch
Patch36: kdelibs-3.5.0-modular-x.patch Patch36: kdelibs-3.5.0-modular-x.patch
Patch37: kdelibs-3.5.0-kio-kdirlister.patch Patch37: kdelibs-3.5.0-kio-kdirlister.patch
Patch38: kdelibs-3.5.0-printing.patch
%if %{arts} %if %{arts}
Requires: arts >= %{arts_epoch}:%{arts_version} Requires: arts >= %{arts_epoch}:%{arts_version}
@ -151,8 +152,17 @@ Obsoletes: kdesupport-devel
%description devel %description devel
This package includes the header files you will need to compile This package includes the header files you will need to compile
applications for KDE. Also included is the KDE API documentation in HTML applications for KDE.
format for easy browsing.
%package docs
Group: Development/Documentation
Summary: KDE API documentation.
Requires: %{name} = %{epoch}:%{version}-%{release}
%description docs
This package includes the KDE API documentation in HTML
format for easy browsing
%prep %prep
%setup -q %setup -q
@ -172,6 +182,7 @@ format for easy browsing.
%patch35 -p1 -b .inttype %patch35 -p1 -b .inttype
%patch36 -p1 -b .modular-x %patch36 -p1 -b .modular-x
%patch37 -p1 -b .kicker_crash %patch37 -p1 -b .kicker_crash
%patch38 -p1 -b .printing
# add redhat into KDE_VERSION_STRING # add redhat into KDE_VERSION_STRING
%if %{redhatify} %if %{redhatify}
@ -183,13 +194,6 @@ export QTDOC=%{qtdocdir}
unset QTDIR && . /etc/profile.d/qt.sh unset QTDIR && . /etc/profile.d/qt.sh
export libltdl_cv_shlibext=".so" export libltdl_cv_shlibext=".so"
%if %{disable_gcc_check_and_hidden_visibility}
# disable gcc check
perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
# disable hidden visibility
perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
%endif
%if %{make_cvs} %if %{make_cvs}
make -f admin/Makefile.common cvs make -f admin/Makefile.common cvs
%endif %endif
@ -234,11 +238,16 @@ if [ "%{_lib}" == "lib64" ] ; then
fi fi
%configure \ %configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--with-qt-libraries=$QTLIB \ --with-qt-libraries=$QTLIB \
--enable-libsuffix="$suffix" \ --enable-libsuffix="$suffix" \
--enable-cups \ --enable-cups \
--enable-mitshm \ --enable-mitshm \
--with-xinerama \ --with-xinerama \
%if %{disable_gcc_check_and_hidden_visibility}
--disable-gcc-hidden-visibility \
%endif
%if %{pie} %if %{pie}
--enable-pie \ --enable-pie \
%endif %endif
@ -254,6 +263,7 @@ fi
--includedir=%{_includedir}/kde \ --includedir=%{_includedir}/kde \
%if %{debug} == 0 %if %{debug} == 0
--disable-debug \ --disable-debug \
--disable-warnings \
%endif %endif
%if %{final} %if %{final}
--enable-final \ --enable-final \
@ -386,10 +396,18 @@ exit 0
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/dcopidl* %{_bindir}/dcopidl*
%{_includedir}/kde %{_includedir}/kde
%files docs
%defattr(-,root,root)
%doc %{_docdir}/%{name}-devel-%{kde_major_version} %doc %{_docdir}/%{name}-devel-%{kde_major_version}
%doc %{_docdir}/HTML/en/kdelibs* %doc %{_docdir}/HTML/en/kdelibs*
%changelog %changelog
* Wed Jan 18 2006 Than Ngo <than@redhat.com> 6:3.5.0-5
- apply patch to fix a printing problem
- add subpackage kdelibs-docs
- enable --enable-new-ldflags #161074
* Wed Dec 21 2005 Than Ngo <than@redhat.com> 6:3.5.0-4 * Wed Dec 21 2005 Than Ngo <than@redhat.com> 6:3.5.0-4
- apply patch to fix crash in kicker on KDE logout - apply patch to fix crash in kicker on KDE logout