diff --git a/kdelibs.spec b/kdelibs.spec index a7c4115..df7c87e 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -2,7 +2,7 @@ %define is_release 1 %define beta %{nil} %define cups cups -%define rel 7 +%define rel 8 %define debug 0 %define DATE 20020802 Version: 3.0.3 @@ -14,7 +14,6 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/sou Source: cvs://cvs.kde.org/%{name}-%{DATE}.tar.bz2 %endif Source1: keramik-%{DATE}.tar.bz2 -Patch: kdelibs-3.0-dlopen-gcc31.patch Patch2: kdelibs-3.0.0-i18nfix.patch Patch3: kdelibs-3.1-iconthemes.patch Patch6: kdelibs-3.0-noxs.patch @@ -28,11 +27,13 @@ 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 # 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 arts >= 7:1.0.2 +Requires: qt >= 3.0.3 +Requires: arts >= 7:1.0.2 %if "%{cups}" != "" Requires: cups-libs >= 1.1.12 BuildRequires: cups-devel >= 1.1.12 @@ -98,7 +99,6 @@ rm -rf $RPM_BUILD_ROOT %endif %patch12 -p1 -b .rpath -#%patch -p1 -b .gcc31dlopen %patch2 -p1 -b .i18n %patch3 -p0 -b .icon %if %{debug} == 0 @@ -113,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT %patch16 -p1 -b .buffermultibyte %patch17 -p1 -b .lang %patch18 -p1 -b .dtfix +%patch19 -p1 -b .menu # Enable keramik perl -pi -e "s,highcolor,highcolor keramik," kstyles/Makefile.am @@ -305,6 +306,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-devel-%{version}/* %changelog +* Sun Sep 1 2002 Than Ngo 3.0.3-8 +- remove merging share/applnk + * Sat Aug 31 2002 Than Ngo 3.0.3-7 - put Red Hat in the version number - desktop file issue