From 6fca52ce0e2d62e19321297f7f5bea27308882c8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: [PATCH] Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdirstat@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- acinclude.m4 | 30 +++++++++++++++--------------- build-howto.html | 6 +++--- kdirstat.spec | 36 ++++++++++++++++++------------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 38bdc44..dda2347 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -479,14 +479,14 @@ if test "$1" = "default"; then if test "$kde_qtver" = "2"; then kde_moduledir='\${libdir}/kde2' else - kde_moduledir='\${libdir}/kde3' + kde_moduledir='\${libdir}/trinity' fi fi if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' + kde_styledir='\${libdir}/trinity/plugins/styles' fi if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' + kde_widgetdir='\${libdir}/trinity/plugins/designer' fi if test -z "$xdg_appsdir"; then xdg_appsdir='\${datadir}/applications/kde' @@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ - kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" + kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin" test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" if test -n "$KDEDIRS"; then kde_save_IFS=$IFS @@ -580,23 +580,23 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - kde32ornewer=1 + trinity2ornewer=1 if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= + trinity2ornewer= else if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then - kde32ornewer= + trinity2ornewer= fi fi - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then - kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" + kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then @@ -607,7 +607,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' AC_SUBST(KCONFIG_COMPILER) @@ -1746,7 +1746,7 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) @@ -1758,7 +1758,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" +kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) @@ -1766,7 +1766,7 @@ ac_kde_libraries="$kde_libdir" kde_widgetdir=NO dnl this might be somewhere else -AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) +AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then AC_MSG_ERROR([ @@ -1774,14 +1774,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) fi -if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then +if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed by kdelibs]) fi if test -n "$kde_widgetdir"; then - kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" + kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" fi diff --git a/build-howto.html b/build-howto.html index ea247f4..2bce33b 100644 --- a/build-howto.html +++ b/build-howto.html @@ -117,14 +117,14 @@ Watch out for error messages and fix them before reporting errors!

-

On SuSE Linux systems, KDE 3.x is installed to /opt/kde3 which is a +

On SuSE Linux systems, KDE 3.x is installed to /opt/trinity which is a good idea if you want to keep some KDE 1.x/2.x programs around. So use that -/opt/kde3 prefix for KDirStat, too - otherwise it will be installed to +/opt/trinity prefix for KDirStat, too - otherwise it will be installed to /opt/kde and clutter up a working KDE 1.x/2.x environment. 

 
-    ./configure --prefix=/opt/kde3
+    ./configure --prefix=/opt/trinity

diff --git a/kdirstat.spec b/kdirstat.spec index 3b04c79..f54e586 100644 --- a/kdirstat.spec +++ b/kdirstat.spec @@ -9,7 +9,7 @@ # # norootforbuild -# neededforbuild kde3-devel-packages +# neededforbuild trinity-devel-packages BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace syslogd sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel arts arts-devel autoconf automake binutils expat fam fam-devel fontconfig fontconfig-devel freeglut freeglut-devel freetype2 freetype2-devel gcc gcc-c++ gdbm gettext glib2 glib2-devel gnome-filesystem jack jack-devel kdelibs3 kdelibs3-devel kdelibs3-doc libart_lgpl libart_lgpl-devel libgcrypt libgcrypt-devel libgpg-error libgpg-error-devel libidn libidn-devel libjpeg libjpeg-devel liblcms liblcms-devel libmng libmng-devel libpng libpng-devel libstdc++-devel libtiff libtiff-devel libtool libxml2 libxml2-devel libxslt libxslt-devel openssl-devel pcre pcre-devel perl python qt3 qt3-devel rpm unsermake update-desktop-files xorg-x11-Mesa xorg-x11-Mesa-devel xorg-x11-devel xorg-x11-libs @@ -36,16 +36,16 @@ Authors: %prep %setup -q -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options update_admin --no-unsermake %build -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options ./configure $configkde --disable-final make %install -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file %name Filesystem %find_lang %name @@ -53,18 +53,18 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %files -f %name.lang %defattr(-,root,root) %doc COPYING AUTHORS ChangeLog TODO README -/opt/kde3/bin/kdirstat -/opt/kde3/share/apps/kdirstat -/opt/kde3/share/appl*/*/kdirstat* -/opt/kde3/share/doc/HTML/*/kdirstat/ -%dir /opt/kde3/share/icons/hicolor/16x16 -%dir /opt/kde3/share/icons/hicolor/16x16/apps -%dir /opt/kde3/share/icons/hicolor/32x32 -%dir /opt/kde3/share/icons/hicolor/32x32/apps -%dir /opt/kde3/share/icons/locolor/16x16/apps -%dir /opt/kde3/share/icons/locolor/32x32/apps -/opt/kde3/share/icons/??color/??x??/*/kdirstat* -%dir /opt/kde3/share/apps/kconf_update -/opt/kde3/share/apps/kconf_update/kdirstat.upd -/opt/kde3/share/apps/kconf_update/fix_move_to_trash_bin.pl +/opt/trinity/bin/kdirstat +/opt/trinity/share/apps/kdirstat +/opt/trinity/share/appl*/*/kdirstat* +/opt/trinity/share/doc/HTML/*/kdirstat/ +%dir /opt/trinity/share/icons/hicolor/16x16 +%dir /opt/trinity/share/icons/hicolor/16x16/apps +%dir /opt/trinity/share/icons/hicolor/32x32 +%dir /opt/trinity/share/icons/hicolor/32x32/apps +%dir /opt/trinity/share/icons/locolor/16x16/apps +%dir /opt/trinity/share/icons/locolor/32x32/apps +/opt/trinity/share/icons/??color/??x??/*/kdirstat* +%dir /opt/trinity/share/apps/kconf_update +/opt/trinity/share/apps/kconf_update/kdirstat.upd +/opt/trinity/share/apps/kconf_update/fix_move_to_trash_bin.pl