From 96af810baeb366424100374b1cc0d27c9ddf547a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:02:58 +0000 Subject: [PATCH] auto-import kdelibs-3.1.3a-0.9x.1 from kdelibs-3.1.3a-0.9x.1.src.rpm --- .cvsignore | 2 +- kdelibs.spec | 155 ++++++++++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 118 insertions(+), 41 deletions(-) diff --git a/.cvsignore b/.cvsignore index 09d4c35..c84dd16 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdelibs-3.1.tar.bz2 +kdelibs-3.1.3a.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index 38ed7f9..ae26b1c 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,10 +1,8 @@ %define debug 0 -%define build_for_ftp 0 - %define cups 1 -%define qtversion 3.1.1 +%define qtversion 3.1.2 %define kde_major_version 3 @@ -12,9 +10,12 @@ %define desktop_file_utils_version 0.2.93 %define libtool 1 +%define fam 0 +%define xrandr 1 +%define menu_path /var/lib/menu -Version: 3.1 -Release: 13 +Version: 3.1.3a +Release: 0.9x.1 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -25,6 +26,7 @@ License: LGPL BuildRoot: %{_tmppath}/%{name}-buildroot Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source1: desktop-create-kmenu.c Patch1: kdelibs-3.0-noxs.patch Patch2: kdelibs-3.0.0-ndebug.patch @@ -33,7 +35,7 @@ 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 +Patch8: kdelibs-3.1.1-lang.patch Patch9: kdelibs-3.0.3-redhat.patch Patch10: kdelibs-3.0.4-dtfix.patch Patch11: kdelibs-3.0.3-lib64.patch @@ -50,13 +52,12 @@ Patch22: kdelibs-3.1-kio.patch Patch23: kdelibs-3.1-no.patch Patch24: kdelibs-3.1-libtool.patch Patch25: kdelibs-3.1-gnome-menu.patch -Patch26: post-3.1.1-kdelibs-kimgio.diff -Patch27: kdelibs-3.1-http.patch -Patch28: kdelibs-3.1-khtml.patch -Patch29: kdelibs-3.1-kcookiejar.patch +Patch26: kdelibs-3.1.3a-xrandr.patch +Patch27: kdelibs-3.1.1-pcre.patch +Patch28: kdelibs-3.1.2-openssl.patch Requires: qt >= 1:%{qtversion} -Requires: arts >= 8:1.1-5 +Requires: arts >= 8:1.1.1 %if %{cups} Requires: cups-libs >= 1.1.12 @@ -68,11 +69,12 @@ Requires: desktop-backgrounds-basic Requires: redhat-menus => 0.30 Requires: redhat-artwork >= 0.53 Prereq: fileutils +Prereq: shadow-utils Prereq: desktop-file-utils >= %{desktop_file_utils_version} %endif -%if %{build_for_ftp} -ExclusiveArch: %{ix86} +%if %{fam} +BuildPrereq: fam-devel %endif BuildPrereq: qt-devel >= %{qtversion} @@ -88,14 +90,19 @@ BuildPrereq: perl-SGMLSpm BuildPrereq: docbook-utils BuildPrereq: pcre-devel BuildPrereq: zlib-devel -BuildPrereq: arts-devel >= 7:1.1.0 +BuildPrereq: arts-devel >= 7:1.1.1 BuildPrereq: audiofile-devel BuildPrereq: openssl-devel BuildPrereq: perl BuildPrereq: gawk BuildPrereq: byacc +BuildPrereq: libart_lgpl-devel >= 2.3.8 +BuildPrereq: bzip2-devel +BuildPrereq: libjpeg-devel +BuildPrereq: pkgconfig Prereq: /sbin/ldconfig +Prereq: dev Obsoletes: %{name}2 Obsoletes: kdesupport @@ -148,22 +155,13 @@ format for easy browsing. %patch23 -p1 -b .no %patch24 -p1 -b .libtool %patch25 -p1 -b .redhat - -pushd kimgio -%patch26 -p0 -b .pdf -popd - -%patch27 -p1 -b .sec -%patch28 -p1 -b .sec -%patch29 -p1 -b .sec +%patch26 -p1 -b .xrandr +%patch27 -p1 -b .pcre +%patch28 -p1 -b .openssl # 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 -%if %{libtool} -make -f Makefile.cvs -%endif - %build unset QTDIR && . /etc/profile.d/qt.sh @@ -174,11 +172,19 @@ 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" export CFLAGS="$FLAGS" +if pkg-config openssl ; then + export CFLAGS="$CFLAGS `pkg-config --cflags openssl`" + export CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`" + export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`" + export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" +fi + # Check which version/distribution we are... VERSION=`cat /etc/redhat-release 2>/dev/null |awk '{ print $5; }'` if [ -z "$VERSION" -o -z "echo $VERSION |sed -e 's,[0-9]*,,g;s,\.,,g'" ]; then @@ -196,18 +202,25 @@ fi --enable-mitshm \ --with-xinerama \ --includedir=%{_includedir}/kde \ -%if "%{debug}" == "0" +%if %{debug} == 0 --disable-debug \ --without-debug \ --enable-final \ %endif - --with-distribution="$VERSION" \ +%if %{fam} == 0 --disable-libfam \ - --without-libfam + --without-libfam \ +%endif + --with-distribution="$VERSION" make %{?smp_mflags} make apidox +# build desktop create kde menu tool +%if %{desktop_file} +gcc $FLAGS -o desktop-create-kmenu %{SOURCE1} +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -216,7 +229,7 @@ make DESTDIR=$RPM_BUILD_ROOT install chmod a+x $RPM_BUILD_ROOT%{_libdir}/* pushd $RPM_BUILD_ROOT%{_docdir} -ln -sf HTML/en/kdelibs-3.1-apidocs %{name}-devel-%{kde_major_version} +ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version} popd # Make symlinks relative @@ -230,7 +243,9 @@ done popd %if %{desktop_file} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{menu_path}/kde + desktop-file-install \ --vendor kde \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -239,6 +254,9 @@ desktop-file-install \ --add-only-show-in KDE \ $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Components/*.desktop +# install desktop-create-kmenu +install -m 755 desktop-create-kmenu $RPM_BUILD_ROOT%{_bindir} + # delete unneeded files rm -rfv $RPM_BUILD_ROOT%{_datadir}/applnk %endif @@ -246,9 +264,31 @@ rm -rfv $RPM_BUILD_ROOT%{_datadir}/applnk %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%pre +if [ -d /etc/skel/Desktop/Autostart ]; then + mv -f /etc/skel/Desktop/Autostart /etc/skel/Desktop/Autostart-OLD..KDE +elif [ -d /etc/skel/Desktop/Autostart.rpmsave ]; then + mv -f /etc/skel/Desktop/Autostart.rpmsave /etc/skel/Desktop/Autostart-OLD..KDE +fi + +/usr/sbin/adduser -c "desktop" -u 80 -s /sbin/nologin -r -d %{menu_path}/kde desktop 2>/dev/null || : + +%post +/sbin/ldconfig + +# create desktop files +if [ -x /usr/bin/desktop-create-kmenu ] ; then + /usr/bin/desktop-create-kmenu >& /dev/null || : +fi + +%postun +/sbin/ldconfig + +# delete desktop files +if [ -x /usr/bin/desktop-create-kmenu ] ; then + /usr/bin/desktop-create-kmenu >& /dev/null || : +fi -%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -312,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libartskde* %{_libdir}/k*.?? %if %{desktop_file} +%attr(755,desktop,desktop) %dir %{menu_path} +%attr(755,desktop,desktop) %dir %{menu_path}/kde +%attr(4755,root,root) %{_bindir}/desktop-create-kmenu %{_datadir}/applications %else %{_datadir}/applnk @@ -344,18 +387,52 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/dcopidl* %{_includedir}/kde %doc %{_docdir}/%{name}-devel-%{kde_major_version} -%doc %{_docdir}/HTML/en/kdelibs-3.1-apidocs +%doc %{_docdir}/HTML/en/kdelibs-apidocs %changelog -* Fri Feb 13 2004 Than Ngo 6:3.1-13 -- CAN-2003-0592 KDE Konqueror cookie path +* Wed Sep 03 2003 Than Ngo 6:3.1.3a-0.9x.1 +- 3.1.3a -* Mon Jul 14 2003 Than Ngo 6:3.1-12 -- securitiy bug - Konqueror Referer Leaking Website Authentication Credentials +* Wed Jul 23 2003 Than Ngo 6:3.1.3-0.9x.4 +- respin -* Mon Apr 7 2003 Than Ngo 6:3.1-11 +* Mon Jul 21 2003 Than Ngo 6:3.1.3-0.9x.3 +- respin + +* Fri Jul 18 2003 Than Ngo 6:3.1.3-0.9x.2 +- 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 + +* Mon Apr 28 2003 Than Ngo 6:3.1.1-0.9x.2 +- 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 Mar 20 2003 Than Ngo 6:3.1.1-2 +- add patch file from CVS to fix: https authentication through proxy fails +- add patch file from CVS to fix: KZip fails for some .zip archives + +* Sun Mar 16 2003 Than Ngo 6:3.1.1-1 +- 3.1.1 stable release +- move desktop-create-kmenu to kdelibs + +* Mon Mar 3 2003 Than Ngo 6:3.1-12 +- lan redirect + +* Mon Feb 24 2003 Than Ngo 6:3.1-11 +- add Buildprereq libart_lgpl-devel + * Mon Feb 24 2003 Than Ngo 6:3.1-10 - move API documentation into kdelibs-devel (#84976) diff --git a/sources b/sources index 993668c..60387b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2 +d05854938dcbda2e571f7f1ba51cdda7 kdelibs-3.1.3a.tar.bz2