From 40d64a8640b74b39ba0c53d665c2f851d46b5858 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 9 Aug 2012 12:03:21 +0200 Subject: RHEL/Fedora: updates kasablanca --- ...asablanca-0.4.0.2-fix_autotools_detection.patch | 111 +++++++++++++++++++++ .../kasablanca/kasablanca-0.4.0.2-ftbfs.patch | 11 -- .../kasablanca-0.4.0.2-missing_ldflags.patch | 11 ++ .../extras/kasablanca/kasablanca-autotools.patch | 111 --------------------- redhat/extras/kasablanca/trinity-kasablanca.spec | 92 +++++++++++------ 5 files changed, 181 insertions(+), 155 deletions(-) create mode 100644 redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch delete mode 100644 redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch create mode 100644 redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch delete mode 100644 redhat/extras/kasablanca/kasablanca-autotools.patch (limited to 'redhat/extras') diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch new file mode 100644 index 000000000..0eae8f419 --- /dev/null +++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch @@ -0,0 +1,111 @@ +--- kasablanca-0.4.0.2/admin/cvs.sh.ORI 2011-12-04 15:24:44.405943353 +0100 ++++ kasablanca-0.4.0.2/admin/cvs.sh 2011-12-04 15:33:50.829581434 +0100 +@@ -30,7 +30,7 @@ + required_autoconf_version="2.53 or newer" + AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` + case $AUTOCONF_VERSION in +- Autoconf*2.5* | autoconf*2.5* ) : ;; ++ Autoconf*2.5* | autoconf*2.5* | [Aa]utoconf*2.6* ) : ;; + "" ) + echo "*** AUTOCONF NOT FOUND!." + echo "*** KDE requires autoconf $required_autoconf_version" +@@ -45,7 +45,7 @@ + + AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` + case $AUTOHEADER_VERSION in +- Autoconf*2.5* | autoheader*2.5* ) : ;; ++ Autoconf*2.5* | autoheader*2.5* | *Autoconf*2.6* ) : ;; + "" ) + echo "*** AUTOHEADER NOT FOUND!." + echo "*** KDE requires autoheader $required_autoconf_version" +@@ -66,7 +66,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* ) : ;; ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) : ;; + "" ) + echo "*** AUTOMAKE NOT FOUND!." + echo "*** KDE requires automake $required_automake_version" +--- kasablanca-0.4.0.2/admin/acinclude.m4.in.ORI 2011-12-04 15:37:05.013464315 +0100 ++++ kasablanca-0.4.0.2/admin/acinclude.m4.in 2011-12-04 15:40:40.722904947 +0100 +@@ -468,14 +468,14 @@ + 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' +@@ -542,7 +542,7 @@ + ) + AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") + +- 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 +@@ -578,7 +578,7 @@ + KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/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 +@@ -1738,7 +1738,7 @@ + + if test -z "$1"; then + +-kde_incdirs="/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="/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) +@@ -1750,7 +1750,7 @@ + So, check this please and use another prefix!]) + fi + +-kde_libdirs="/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="/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) +@@ -1758,7 +1758,7 @@ + + 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([ +@@ -1766,14 +1766,14 @@ + 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/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch deleted file mode 100644 index 6596d894a..000000000 --- a/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kasablanca-0.4.0.2/src/Makefile.am.ORI 2011-12-04 15:42:39.245402912 +0100 -+++ kasablanca-0.4.0.2/src/Makefile.am 2011-12-04 15:42:45.744265760 +0100 -@@ -22,7 +22,7 @@ - # the application source, library search path, and link libraries - kasablanca_SOURCES = main.cpp kasablanca.cpp bookmarkdialog.cpp customconnectdialog.cpp fileexistsdialog.cpp kbitem.cpp Q_bookmarkdialog.ui Q_fileexistsdialog.ui Q_mainwindow.ui eventhandler.cpp ftpthread.cpp ftplib.cpp ftpsession.cpp kbfileinfo.cpp kbdirinfo.cpp kbdir.cpp kbfile.cpp kbtransferitem.cpp kbtransferdir.cpp kbtransferfile.cpp kbconfig.kcfgc Q_colorspreferencesdialog.ui Q_generalpreferencesdialog.ui kbtaskview.cpp Q_userinterfacepreferencesdialog.ui kbbookmarkitem.cpp kbsiteinfo.cpp Q_customconnectdialog.ui Q_importdialog.ui importdialog.cpp kbstatustip.cpp - kasablanca_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kasablanca_LDADD = -lssl $(LIB_KDEUI) -+kasablanca_LDADD = -lssl $(LIB_KDEUI) -lcrypto - - # this is where the desktop file will go - shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch new file mode 100644 index 000000000..24330fa2d --- /dev/null +++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch @@ -0,0 +1,11 @@ +--- kasablanca-0.4.0.2/src/Makefile.am.ORI 2012-08-07 15:52:01.549962016 +0200 ++++ kasablanca-0.4.0.2/src/Makefile.am 2012-08-07 15:52:11.265930503 +0200 +@@ -22,7 +22,7 @@ + # the application source, library search path, and link libraries + kasablanca_SOURCES = main.cpp kasablanca.cpp bookmarkdialog.cpp customconnectdialog.cpp fileexistsdialog.cpp kbitem.cpp Q_bookmarkdialog.ui Q_fileexistsdialog.ui Q_mainwindow.ui eventhandler.cpp ftpthread.cpp ftplib.cpp ftpsession.cpp kbfileinfo.cpp kbdirinfo.cpp kbdir.cpp kbfile.cpp kbtransferitem.cpp kbtransferdir.cpp kbtransferfile.cpp kbconfig.kcfgc Q_colorspreferencesdialog.ui Q_generalpreferencesdialog.ui kbtaskview.cpp Q_userinterfacepreferencesdialog.ui kbbookmarkitem.cpp kbsiteinfo.cpp Q_customconnectdialog.ui Q_importdialog.ui importdialog.cpp kbstatustip.cpp + kasablanca_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-kasablanca_LDADD = -lssl $(LIB_KDEUI) ++kasablanca_LDADD = -lssl $(LIB_KDEUI) -lcrypto $(LIB_KDECORE) -lDCOP $(LIB_QT) + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/extras/kasablanca/kasablanca-autotools.patch b/redhat/extras/kasablanca/kasablanca-autotools.patch deleted file mode 100644 index 0eae8f419..000000000 --- a/redhat/extras/kasablanca/kasablanca-autotools.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- kasablanca-0.4.0.2/admin/cvs.sh.ORI 2011-12-04 15:24:44.405943353 +0100 -+++ kasablanca-0.4.0.2/admin/cvs.sh 2011-12-04 15:33:50.829581434 +0100 -@@ -30,7 +30,7 @@ - required_autoconf_version="2.53 or newer" - AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` - case $AUTOCONF_VERSION in -- Autoconf*2.5* | autoconf*2.5* ) : ;; -+ Autoconf*2.5* | autoconf*2.5* | [Aa]utoconf*2.6* ) : ;; - "" ) - echo "*** AUTOCONF NOT FOUND!." - echo "*** KDE requires autoconf $required_autoconf_version" -@@ -45,7 +45,7 @@ - - AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` - case $AUTOHEADER_VERSION in -- Autoconf*2.5* | autoheader*2.5* ) : ;; -+ Autoconf*2.5* | autoheader*2.5* | *Autoconf*2.6* ) : ;; - "" ) - echo "*** AUTOHEADER NOT FOUND!." - echo "*** KDE requires autoheader $required_autoconf_version" -@@ -66,7 +66,7 @@ - echo "*** KDE requires automake $required_automake_version" - exit 1 - ;; -- automake*1.6.* | automake*1.7* | automake*1.8* ) : ;; -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) : ;; - "" ) - echo "*** AUTOMAKE NOT FOUND!." - echo "*** KDE requires automake $required_automake_version" ---- kasablanca-0.4.0.2/admin/acinclude.m4.in.ORI 2011-12-04 15:37:05.013464315 +0100 -+++ kasablanca-0.4.0.2/admin/acinclude.m4.in 2011-12-04 15:40:40.722904947 +0100 -@@ -468,14 +468,14 @@ - 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' -@@ -542,7 +542,7 @@ - ) - AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") - -- 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 -@@ -578,7 +578,7 @@ - KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/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 -@@ -1738,7 +1738,7 @@ - - if test -z "$1"; then - --kde_incdirs="/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="/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) -@@ -1750,7 +1750,7 @@ - So, check this please and use another prefix!]) - fi - --kde_libdirs="/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="/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) -@@ -1758,7 +1758,7 @@ - - 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([ -@@ -1766,14 +1766,14 @@ - 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/redhat/extras/kasablanca/trinity-kasablanca.spec b/redhat/extras/kasablanca/trinity-kasablanca.spec index 4604d7491..16c5f61ce 100644 --- a/redhat/extras/kasablanca/trinity-kasablanca.spec +++ b/redhat/extras/kasablanca/trinity-kasablanca.spec @@ -1,16 +1,30 @@ +%define kdecomp kasablanca + # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif -%define kdecomp kasablanca -%define tde_docdir %{_docdir}/kde +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + Name: trinity-%{kdecomp} Summary: Graphical FTP client Version: 0.4.0.2 -Release: 1%{?dist} +Release: 1%{?dist}%{?_variant} License: GPLv2+ Url: http://kasablanca.berlios.de/ @@ -18,13 +32,16 @@ Source: http://download.berlios.de/kasablanca/kasablanca-%{version}.tar.gz Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# [kasablanca] Fix bad content in icon (?) Patch1: kasablanca-0.4.0.2-dt.patch -Patch2: kasablanca-autotools.patch -Patch3: kasablanca-0.4.0.2-ftbfs.patch +# [kasablanca] Fix detection of newer autotools +Patch2: kasablanca-0.4.0.2-fix_autotools_detection.patch +# [kasablanca] Missing LDFLAGS cause FTBFS +Patch3: kasablanca-0.4.0.2-missing_ldflags.patch BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-tdelibs-devel BuildRequires: openssl-devel BuildRequires: libutempter-devel @@ -43,13 +60,13 @@ Kasablanca is an ftp client, among its features are currently: %setup -q -n %{kdecomp}-%{version} %patch1 -p1 -b .dt %patch2 -p1 -%patch3 -p1 +%patch3 -p1 -b .ldflags # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -58,8 +75,10 @@ Kasablanca is an ftp client, among its features are currently: %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +export KDEDIR=%{tde_prefix} ## Needed(?) for older/legacy setups, harmless otherwise if pkg-config openssl ; then @@ -67,31 +86,36 @@ if pkg-config openssl ; then fi %configure \ - --disable-rpath \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ - --with-extra-includes=%{_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_includedir} \ + --datadir=%{tde_datadir} \ + --disable-static \ + --disable-rpath \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --with-extra-includes=%{tde_includedir}/tqt -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} LIBTOOL=$(which libtool) %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ + --dir $RPM_BUILD_ROOT%{tde_datadir}/applications/kde \ --vendor="" \ --add-category="Network" \ --add-category="KDE" \ --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop + $RPM_BUILD_ROOT%{tde_datadir}/applnk/*/*.desktop ## File lists -# locale's -%find_lang %{kdecomp} || touch %{kdecomp}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then @@ -109,33 +133,35 @@ for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do done fi +# locale's +%find_lang %{kdecomp} %clean %__rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : +touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : %postun if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &> /dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : + gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : fi %posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/* -%{_datadir}/applications/kde/*.desktop -%{_datadir}/apps/kasablanca/ -%{_datadir}/config*/* -%{_datadir}/icons/hicolor/*/*/* -%{tde_docdir}/HTML/en/kasablanca +%{tde_bindir}/kasablanca +%{tde_tdeappdir}/kasablanca.desktop +%{tde_datadir}/apps/kasablanca/ +%{tde_datadir}/config.kcfg/kbconfig.kcfg +%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png +%{tde_tdedocdir}/HTML/en/kasablanca/ %changelog * Sun Dec 04 2011 Francois Andriot - 0.4.0.2-1 -- cgit v1.2.3