diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-11-07 15:32:15 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-11-07 15:32:15 +0100 |
| commit | e187705a4cf93d04d69e4b58351c128432bf8ba8 (patch) | |
| tree | 863436fe53d6780c1f9303f0061c520f39b4eeab /redhat/applications/kasablanca | |
| parent | 10d8be91c9ba6a6360c6ac9ee818408c42c0663b (diff) | |
| download | tde-packaging-e187705a4cf93d04d69e4b58351c128432bf8ba8.tar.gz tde-packaging-e187705a4cf93d04d69e4b58351c128432bf8ba8.zip | |
RPM Packaging: update for 14.0.2
Diffstat (limited to 'redhat/applications/kasablanca')
| -rw-r--r-- | redhat/applications/kasablanca/kasablanca-14.0.0.patch | 27 | ||||
| -rw-r--r-- | redhat/applications/kasablanca/kasablanca-14.0.0.spec | 4 |
2 files changed, 1 insertions, 30 deletions
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.patch b/redhat/applications/kasablanca/kasablanca-14.0.0.patch deleted file mode 100644 index 3f592be5a..000000000 --- a/redhat/applications/kasablanca/kasablanca-14.0.0.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp.ORI 2014-02-19 22:52:20.875005485 +0100 -+++ trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp 2014-02-19 22:53:01.488995960 +0100 -@@ -1094,8 +1094,8 @@ - - bool FtpThread::FormatFilelist(const char *filename, TQString current, filist *dirtable, filist *filetable) - { -- int i, blocks, space, month_int = 1; -- unsigned int loc, fileloc, datebegin, sizebegin = 0; -+ int i, blocks, space, month_int = 1, loc; -+ unsigned int fileloc, datebegin, sizebegin = 0; - string buffer, filestring; - - FILE* dirfile; -diff --git a/src/Makefile.am b/src/Makefile.am -index 0b6b597..8cf8cb2 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -25,8 +25,7 @@ kasablanca_LDFLAGS = $(TDE_RPATH) $(all_libraries) - kasablanca_LDADD = -lssl $(LIB_TDEUI) -lcrypto $(LIB_TDECORE) -lDCOP $(LIB_QT) - - # this is where the desktop file will go --shelldesktopdir = $(kde_appsdir)/Utilities --shelldesktop_DATA = kasablanca.desktop -+xdg_apps_DATA = kasablanca.desktop - - # this is where the shell's XML-GUI resource file goes - shellrcdir = $(kde_datadir)/kasablanca diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec index 960b5295c..eefff8f42 100644 --- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec +++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec @@ -38,7 +38,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.4.0.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Graphical FTP client for Trinity Group: Applications/Internet Url: http://kasablanca.berlios.de/ @@ -56,7 +56,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-14.0.0.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -117,7 +116,6 @@ Kasablanca is an ftp client, among its features are currently: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .orig %__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" |