diff --git a/.cvsignore b/.cvsignore index c84dd16..24d5caf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdelibs-3.1.3a.tar.bz2 +kdelibs-3.1.4.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index ae26b1c..d395a83 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -14,7 +14,7 @@ %define xrandr 1 %define menu_path /var/lib/menu -Version: 3.1.3a +Version: 3.1.4 Release: 0.9x.1 Summary: K Desktop Environment - Libraries Name: kdelibs @@ -45,7 +45,6 @@ Patch14: kdelibs-3.1-ansi.patch Patch15: kdelibs-3.1-buildroot.patch Patch16: kdelibs-3.1-ssl-krb5.patch Patch18: kdelibs-3.1-icon_scale.patch -Patch19: kdelibs-3.1-kate.patch Patch20: kdelibs-3.1-defaultstyle.patch Patch21: kdelibs-3.1-flash.patch Patch22: kdelibs-3.1-kio.patch @@ -55,9 +54,11 @@ Patch25: kdelibs-3.1-gnome-menu.patch Patch26: kdelibs-3.1.3a-xrandr.patch Patch27: kdelibs-3.1.1-pcre.patch Patch28: kdelibs-3.1.2-openssl.patch +Patch31: kdelibs-3.1.3-fullscreen-gtk.patch Requires: qt >= 1:%{qtversion} Requires: arts >= 8:1.1.1 +Requires: openssl = 0.9.7a %if %{cups} Requires: cups-libs >= 1.1.12 @@ -73,6 +74,9 @@ Prereq: shadow-utils Prereq: desktop-file-utils >= %{desktop_file_utils_version} %endif +Prereq: /sbin/ldconfig +Prereq: dev + %if %{fam} BuildPrereq: fam-devel %endif @@ -101,9 +105,6 @@ BuildPrereq: bzip2-devel BuildPrereq: libjpeg-devel BuildPrereq: pkgconfig -Prereq: /sbin/ldconfig -Prereq: dev - Obsoletes: %{name}2 Obsoletes: kdesupport @@ -148,7 +149,6 @@ format for easy browsing. %patch15 -p1 -b .buildroot %patch16 -p1 -b .ssl-krb5 %patch18 -p1 -b .icon_scale -%patch19 -p1 -b .kate %patch20 -p1 -b .defaultstyle %patch21 -p1 %patch22 -p1 -b .kio @@ -158,6 +158,7 @@ format for easy browsing. %patch26 -p1 -b .xrandr %patch27 -p1 -b .pcre %patch28 -p1 -b .openssl +%patch31 -p1 -b .fullscreen # add redhat into KDE_VERSION_STRING perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h @@ -165,6 +166,8 @@ perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{ver %build unset QTDIR && . /etc/profile.d/qt.sh +make -f admin/Makefile.common cvs + # set some default FLAGS %if %{debug} FLAGS="-O0 -DDEBUG=1" @@ -172,7 +175,6 @@ FLAGS="-O0 -DDEBUG=1" 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" @@ -213,6 +215,12 @@ fi %endif --with-distribution="$VERSION" +# ld breaks with -fPIC on ppc, workaround +# it will be removed when this bug is fixed +%ifarch ppc ppc64 +perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool +%endif + make %{?smp_mflags} make apidox @@ -390,34 +398,66 @@ fi %doc %{_docdir}/HTML/en/kdelibs-apidocs %changelog -* Wed Sep 03 2003 Than Ngo 6:3.1.3a-0.9x.1 -- 3.1.3a +* Mon Sep 15 2003 Than Ngo 6:3.1.4-0.9x.1 +- 3.1.4 -* Wed Jul 23 2003 Than Ngo 6:3.1.3-0.9x.4 -- respin +* Thu Aug 28 2003 Than Ngo 6:3.1.3-8 +- adopted a patch file from Mandrake, it fixes full screen problem -* Mon Jul 21 2003 Than Ngo 6:3.1.3-0.9x.3 -- respin +* Wed Aug 27 2003 Than Ngo 6:3.1.3-7 +- rebuilt -* Fri Jul 18 2003 Than Ngo 6:3.1.3-0.9x.2 +* Wed Aug 27 2003 Than Ngo 6:3.1.3-6 +- rebuilt + +* Fri Aug 22 2003 Than Ngo 6:3.1.3-5 +- fix build problem with gcc 3.x + +* Wed Aug 06 2003 Than Ngo 6:3.1.3-4 +- rebuilt + +* Wed Aug 06 2003 Than Ngo 6:3.1.3-3 +- add patch file to fix horizontal scrollbar issue + +* Thu Jul 31 2003 Than Ngo 6:3.1.3-2 +- rebuilt + +* Tue Jul 29 2003 Than Ngo 6:3.1.3-1 +- 3.1.3 - add Prereq: dev -* Wed Jul 16 2003 Than Ngo 6:3.1.3-0.9x.1 -- 3.1.3 release -- add pkgconfig as a buildreq -- if pkgconfig admits to knowing about openssl, incorporate its information - -* Mon May 5 2003 Than Ngo 6:3.1.1-0.9x.3 -- fix dependency bug +* Tue Jun 17 2003 Than Ngo 6:3.1.2-7 +- rebuilt -* Mon Apr 28 2003 Than Ngo 6:3.1.1-0.9x.2 +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sun May 18 2003 Than Ngo 6:3.1.2-5 +- remove workaround for glibc bug + +* Wed May 14 2003 Than Ngo 6:3.1.2-3 +- fix dependence bug + +* Tue May 13 2003 Than Ngo 6:3.1.2-2 +- fix a bug in loading openssl library + +* Mon May 12 2003 Than Ngo 6:3.1.2-1 +- 3.1.2 + +* Wed Apr 30 2003 Than Ngo 6:3.1.1-7 +- build with -fpic on ppc (ld bugs) + +* Mon Apr 28 2003 Than Ngo 6:3.1.1-6 - libjpeg-devel and bzip2-devel in buildrequires (#89635) -- use pcre native API -- add xrandr support -- PS/PDF file handling vulnerability -* Wed Apr 2 2003 Than Ngo 6:3.1.1-0.9x.1 -- 3.1.1 for RHL 9 +* Thu Apr 24 2003 Than Ngo 6:3.1.1-5 +- use pcre native API + +* Mon Apr 14 2003 Than Ngo 6:3.1.1-4 +- add xrandr support + +* Sun Apr 13 2003 Than Ngo 6:3.1.1-3 +- PS/PDF file handling vulnerability * Thu Mar 20 2003 Than Ngo 6:3.1.1-2 - add patch file from CVS to fix: https authentication through proxy fails diff --git a/sources b/sources index 60387b3..4baac87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d05854938dcbda2e571f7f1ba51cdda7 kdelibs-3.1.3a.tar.bz2 +82c265de78d53c7060a09c5cb1a78942 kdelibs-3.1.4.tar.bz2