Hello community, here is the log from the commit of package kdebase3 checked in at Sun Aug 6 21:51:47 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-07-28 14:53:00.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-08-03 17:45:47.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 3 17:45:35 CEST 2006 - stbinner@suse.de + +- adapt to new X.org paths + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.WKKCM7/_old 2006-08-06 21:51:29.000000000 +0200 +++ /var/tmp/diff_new_pack.WKKCM7/_new 2006-08-06 21:51:29.000000000 +0200 @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.4 -Release: 1 +Release: 2 %define kde_version 3.5.4 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -288,7 +288,11 @@ %package session Summary: The KDE Session Group: System/GUI/KDE +%if %suse_version > 1010 +Provides: kdebase3:/usr/bin/kde +%else Provides: kdebase3:/usr/X11R6/bin/kde +%endif Requires: kdebase3 %description session @@ -306,7 +310,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 102 +Release: 103 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -450,15 +454,24 @@ PARANOIA="--with-cdparanoia" %endif LDAP="--with-ldap" +%if %suse_version > 1010 + 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 \ $LDAP \ $FLAGS \ $XINERAMA \ +%if %suse_version > 1010 + --with-motif-libraries=/usr/%{_lib}/ \ +%else --with-motif-libraries=/usr/X11R6/%{_lib}/ \ +%endif --with-motif-includes=$MOTIF_INCLUDE \ --with-samba-libs \ --with-pam=xdm \ @@ -494,11 +507,17 @@ kde_post_install install -m 0644 %SOURCE12 $RPM_BUILD_ROOT/opt/kde3/share/fonts/ install -D -m 0644 %SOURCE14 $RPM_BUILD_ROOT/etc/pam.d/xdm-np -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin \ - ${RPM_BUILD_ROOT}/usr/bin \ +%if %suse_version < 1011 +mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin +%endif +mkdir -p ${RPM_BUILD_ROOT}/usr/bin \ ${RPM_BUILD_ROOT}/usr/sbin \ ${RPM_BUILD_ROOT}/var/run/xdmctl +%if %suse_version > 1010 + ln -fs /opt/kde3/bin/startkde $RPM_BUILD_ROOT/usr/bin/kde +%else ln -fs /opt/kde3/bin/startkde $RPM_BUILD_ROOT/usr/X11R6/bin/kde +%endif ln -sf rcxdm ${RPM_BUILD_ROOT}/usr/sbin/rckdm mv ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd ${RPM_BUILD_ROOT}/usr/bin/ksysguardd ln -sf /usr/bin/ksysguardd ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd @@ -1296,7 +1315,11 @@ %files session %defattr(-,root,root) +%if %suse_version > 1010 +/usr/bin/kde +%else /usr/X11R6/bin/kde +%endif %if %suse_version > 920 /usr/share/xsessions %endif @@ -1350,6 +1373,8 @@ %endif %changelog -n kdebase3 +* Thu Aug 03 2006 - stbinner@suse.de +- adapt to new X.org paths * Sun Jul 23 2006 - coolo@suse.de - update to KDE 3.5.4: * support X-KDE-Protocols in konqi RMB menu ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...