Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-01-25 10:37:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old) and /work/SRC/openSUSE:Factory/.kdebase3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2011-12-12 17:01:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2012-01-25 10:37:27.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Jan 23 14:19:07 UTC 2012 - an...@opensuse.org + +- build fileshareset with PIE option + +------------------------------------------------------------------- +Wed Jan 11 18:02:45 UTC 2012 - an...@opensuse.org + +- add small patch from Slackware + +------------------------------------------------------------------- New: ---- kdebase-slackware-kicker.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.EOwDs1/_old 2012-01-25 10:37:29.000000000 +0100 +++ /var/tmp/diff_new_pack.EOwDs1/_new 2012-01-25 10:37:29.000000000 +0100 @@ -252,6 +252,7 @@ Patch266: further-desktop-icons-adjustment.patch Patch267: kdebase-pardus-fix-autosuspend.patch Patch268: systemd-shutdown.patch +Patch269: kdebase-slackware-kicker.diff %description This package contains kdebase, one of the basic packages of the K @@ -262,12 +263,6 @@ This package is needed if you want to use the KDE Desktop. It is not needed if you only want to start some KDE applications. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package -n misc-console-font License: GPL-2.0+ Group: System/GUI/KDE @@ -303,11 +298,6 @@ This package contains the wrkspace components of kdebase3 like kdesktop, kicker and kwin. - -Authors: --------- - The KDE Team <k...@kde.org> - %package apps License: GPL-2.0+ Summary: Major Applications KDE3 Desktop @@ -319,11 +309,6 @@ This package contains the major applications kdebase3 like Kate, Konqueror and KWrite. - -Authors: --------- - The KDE Team <k...@kde.org> - %package devel License: GPL-2.0+ Requires: kdelibs3-devel kdebase3 = %version kdebase3-apps = %version kdebase3-runtime = %version kdebase3-workspace = %version @@ -339,12 +324,6 @@ This package is not needed if you do not want to compile high level KDE applications. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package kdm License: GPL-2.0+ # usesubdirs kdm @@ -360,12 +339,6 @@ %description kdm This package contains kdm, the login and session manager for KDE. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package samba License: GPL-2.0+ # usesubdirs kioslave/smb kcontrol/samba @@ -376,12 +349,6 @@ This package provides the "smb://" protocol, to connect to and from Windows and Samba shares. - - -Authors: --------- - The KDE Team <k...@kde.org> - %package extra License: GPL-2.0+ # usesubdirs kpersonalizer kcontrol/thememgr @@ -396,12 +363,6 @@ - khotkeys aRts support - for voice triggered shortcuts - - -Authors: --------- - The KDE Team <k...@kde.org> - %package nsplugin License: GPL-2.0+ %ifarch x86_64 ppc64 s390x ia64 @@ -417,12 +378,6 @@ have to enable JavaScript for this. - -Authors: --------- - The KDE Team <k...@kde.org> - - %package ksysguardd License: GPL-2.0+ PreReq: %insserv_prereq %fillup_prereq aaa_base @@ -436,13 +391,6 @@ This package can be installed on servers without any other KDE packages to guard the system from remote computers. - - -Authors: --------- - The KDE Team <k...@kde.org> - - %package session License: GPL-2.0+ Summary: The KDE Session @@ -454,12 +402,6 @@ This package contains the startup scripts necessary to start a KDE session from kdm. - - -Authors: --------- - The KDE Team <k...@kde.org> - %if %suse_version < 1140 %package beagle @@ -475,12 +417,6 @@ This package contains kdebase plugins which provide additional search functionality via Beagle. - - -Authors: --------- - The KDE Team <k...@kde.org> - %endif %package -n fileshareset @@ -495,12 +431,6 @@ add or remove file shares. It's also possible to list currently shared locations. /etc/security/fileshare.conf is the main configuration file. - - -Authors: --------- - Uwe Gansert <uwe.gansert at SuSE dot de> - %define sysconfdir /etc %prep @@ -677,6 +607,7 @@ %patch266 -p1 %patch267 -p1 %patch268 -p1 +%patch269 -p4 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png @@ -697,14 +628,10 @@ %ifnarch s390 PARANOIA="--with-cdparanoia" %endif - LDAP="--with-ldap" -%if %suse_version > 1010 - MOTIF_INCLUDE="/usr/include" +LDAP="--with-ldap" +MOTIF_INCLUDE="/usr/include" X_SERVER=/usr/bin/X RUN_KAPPFINDER=no \ -%else - MOTIF_INCLUDE="/usr/X11R6/include" -X_SERVER=/usr/X11R6/bin/X RUN_KAPPFINDER=no \ -%endif + ./configure \ $configkde \ $PARANOIA \ @@ -721,6 +648,9 @@ --with-kss-pam=kcheckpass do_make %{?_smp_mflags} cd ../fileshareset2 +export CXXFLAGS="$CXXFLAGS -fPIE" +export CFLAGS="$CXXFLAGS -fPIE" +export LDFLAGS="$LDFLAGS -pie" ./configure --prefix=%{fileshare_prefix} make %{?_smp_mflags} ++++++ kdebase-pardus-fix-fish.patch ++++++ --- /var/tmp/diff_new_pack.EOwDs1/_old 2012-01-25 10:37:30.000000000 +0100 +++ /var/tmp/diff_new_pack.EOwDs1/_new 2012-01-25 10:37:30.000000000 +0100 @@ -11,15 +11,6 @@ index 4b7ea26..3967bcd 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp -@@ -2,7 +2,7 @@ - fish.cpp - a FISH kioslave - ------------------- - begin : Thu Oct 4 17:09:14 CEST 2001 -- copyright : (C) 2001-2003 by J�rg Walter -+ copyright : (C) 2001-2003 by J�rg Walter - email : jwalt-...@garni.ch - ***************************************************************************/ - @@ -1430,7 +1430,7 @@ void fishProtocol::run() { sent(); } ++++++ kdebase-slackware-kicker.diff ++++++ --- branches/KDE/3.5/kdebase/kicker/taskbar/taskbar.cpp 2008/08/28 23:10:18854164 +++ branches/KDE/3.5/kdebase/kicker/taskbar/taskbar.cpp 2008/11/19 00:45:13886334 @@ -304,6 +304,7 @@ Panner::resizeEvent(e); reLayoutEventually(); + setViewportBackground(); } void TaskBar::add(Task::Ptr task) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org