diff --git a/.gitignore b/.gitignore index 53d29ca..1d953a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ -/ark-4.8.5.tar.xz -/ark-4.9.1.tar.xz -/ark-4.9.2.tar.xz -/ark-4.9.3.tar.xz -/ark-4.9.4.tar.xz -/ark-4.9.90.tar.xz -/ark-4.9.95.tar.xz -/ark-4.9.97.tar.xz +/ark-4.9.5.tar.xz +/ark-4.9.98.tar.xz diff --git a/ark-4.9.97-improve_subfolder_autodetection.patch b/ark-4.9.97-improve_subfolder_autodetection.patch index e0e3365..212eeb1 100644 --- a/ark-4.9.97-improve_subfolder_autodetection.patch +++ b/ark-4.9.97-improve_subfolder_autodetection.patch @@ -1,17 +1,31 @@ -diff --git a/kerfuffle/jobs.cpp b/kerfuffle/jobs.cpp -index aedc62c4c9902c4f3207c648747f2e427446d5e5..de16439ce46283956e7741662bda19d1e8e591fa 100644 ---- a/kerfuffle/jobs.cpp -+++ b/kerfuffle/jobs.cpp -@@ -217,7 +217,8 @@ void ListJob::onNewEntry(const ArchiveEntry& entry) - m_isPasswordProtected |= entry [ IsPasswordProtected ].toBool(); +diff --git a/app/batchextract.cpp b/app/batchextract.cpp +index 9e466350568384247e99362745205c417b27873f..86f946b18f94f83b42d4bcd0bc320e6a5a3e7e64 100644 +--- a/app/batchextract.cpp ++++ b/app/batchextract.cpp +@@ -68,9 +68,9 @@ void BatchExtract::addExtraction(Kerfuffle::Archive* archive) + { + QString destination = destinationFolder(); - if (m_isSingleFolderArchive) { -- const QString fileName(entry[FileName].toString()); -+ const QString fileName(entry[FileName].toString() -+ .replace(QRegExp(QString::fromAscii("^\\./")), QString())); - const QString basePath(fileName.split(QLatin1Char( '/' )).at(0)); +- if ((autoSubfolder()) && (!archive->isSingleFolderArchive())) { ++ if ((autoSubfolder()) && (!archive->isSingleFolderArchive() || !archive->fileBaseName().startsWith(archive->subfolderName()))) { + const QDir d(destination); +- QString subfolderName = archive->subfolderName(); ++ QString subfolderName = archive->fileBaseName(); - if (m_basePath.isEmpty()) { + if (d.exists(subfolderName)) { + subfolderName = KIO::RenameDialog::suggestName(destination, subfolderName); +diff --git a/kerfuffle/archive.h b/kerfuffle/archive.h +index 515788f978c1d29146c25dcb57a9dad2d46371f7..38049f2c949eb2ab804fc61f9da9336e6e848b77 100644 +--- a/kerfuffle/archive.h ++++ b/kerfuffle/archive.h +@@ -95,6 +95,7 @@ public: + ~Archive(); + + QString fileName() const; ++ QString fileBaseName() const; + bool isReadOnly() const; + + KJob* open(); diff --git a/kerfuffle/archive.cpp b/kerfuffle/archive.cpp index c2c5b18528def63405a8703475b1c592ca945973..470fc56879a2d5e579389b69591da9f230af74ea 100644 --- a/kerfuffle/archive.cpp @@ -50,31 +64,17 @@ index c2c5b18528def63405a8703475b1c592ca945973..470fc56879a2d5e579389b69591da9f2 } m_hasBeenListed = true; -diff --git a/kerfuffle/archive.h b/kerfuffle/archive.h -index 515788f978c1d29146c25dcb57a9dad2d46371f7..38049f2c949eb2ab804fc61f9da9336e6e848b77 100644 ---- a/kerfuffle/archive.h -+++ b/kerfuffle/archive.h -@@ -95,6 +95,7 @@ public: - ~Archive(); - - QString fileName() const; -+ QString fileBaseName() const; - bool isReadOnly() const; - - KJob* open(); -diff --git a/app/batchextract.cpp b/app/batchextract.cpp -index 9e466350568384247e99362745205c417b27873f..d20d105621ef49506a195a56cf5e26184192d03d 100644 ---- a/app/batchextract.cpp -+++ b/app/batchextract.cpp -@@ -68,9 +68,9 @@ void BatchExtract::addExtraction(Kerfuffle::Archive* archive) - { - QString destination = destinationFolder(); +diff --git a/kerfuffle/jobs.cpp b/kerfuffle/jobs.cpp +index aedc62c4c9902c4f3207c648747f2e427446d5e5..de16439ce46283956e7741662bda19d1e8e591fa 100644 +--- a/kerfuffle/jobs.cpp ++++ b/kerfuffle/jobs.cpp +@@ -217,7 +217,8 @@ void ListJob::onNewEntry(const ArchiveEntry& entry) + m_isPasswordProtected |= entry [ IsPasswordProtected ].toBool(); -- if ((autoSubfolder()) && (!archive->isSingleFolderArchive())) { -+ if ((autoSubfolder()) && (!archive->isSingleFolderArchive() || archive->subfolderName() != archive->fileBaseName())) { - const QDir d(destination); -- QString subfolderName = archive->subfolderName(); -+ QString subfolderName = archive->fileBaseName(); + if (m_isSingleFolderArchive) { +- const QString fileName(entry[FileName].toString()); ++ const QString fileName(entry[FileName].toString() ++ .replace(QRegExp(QString::fromAscii("^\\./")), QString())); + const QString basePath(fileName.split(QLatin1Char( '/' )).at(0)); - if (d.exists(subfolderName)) { - subfolderName = KIO::RenameDialog::suggestName(destination, subfolderName); + if (m_basePath.isEmpty()) { diff --git a/ark-4.9.97-x-source-rpm.patch b/ark-4.9.97-x-source-rpm.patch deleted file mode 100644 index 4cf8b6e..0000000 --- a/ark-4.9.97-x-source-rpm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ark-4.9.97/plugins/libarchive/CMakeLists.txt.x-source-rpm ark-4.9.97/plugins/libarchive/CMakeLists.txt ---- ark-4.9.97/plugins/libarchive/CMakeLists.txt.x-source-rpm 2012-12-17 09:07:06.000000000 -0600 -+++ ark-4.9.97/plugins/libarchive/CMakeLists.txt 2013-01-05 13:12:05.226847187 -0600 -@@ -4,7 +4,7 @@ include_directories(${LIBARCHIVE_INCLUDE - set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;") - set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;") - if(HAVE_LIBARCHIVE_RPM_SUPPORT) -- set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-rpm;") -+ set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-rpm;application/x-source-rpm;") - endif(HAVE_LIBARCHIVE_RPM_SUPPORT) - if(HAVE_LIBARCHIVE_CAB_SUPPORT) - set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/vnd.ms-cab-compressed;") diff --git a/ark.spec b/ark.spec index da9c398..382eaf3 100644 --- a/ark.spec +++ b/ark.spec @@ -1,7 +1,7 @@ Name: ark Summary: Archive manager -Version: 4.9.97 -Release: 3%{?dist} +Version: 4.9.98 +Release: 1%{?dist} License: GPLv2+ URL: http://utils.kde.org/projects/ark @@ -16,8 +16,6 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar ## upstreamable patches # libkerfuffle namelink_skip Patch50: ark-4.7.80-namelink_skip.patch -# https://bugzilla.redhat.com/885316 -Patch51: ark-4.9.97-x-source-rpm.patch # https://git.reviewboard.kde.org/r/107635/ Patch52: ark-4.9.97-r107635.patch # https://git.reviewboard.kde.org/r/107634/ @@ -69,7 +67,6 @@ Provides: kdeutils-ark-libs = 6:%{version}-%{release} %setup -q -n %{name}-%{version} %patch50 -p1 -b .namelink_skip -%patch51 -p1 -b .x-source-rpm %patch52 -p1 -b .r107635 %patch53 -p1 -b .improve_subfolder_autodetection @@ -131,6 +128,10 @@ fi %changelog +* Tue Jan 22 2013 Rex Dieter - 4.9.98-1 +- 4.9.98 +- respin reviewboard#107634 patch + * Thu Jan 17 2013 Tomas Bzatek - 4.9.97-3 - Rebuilt for new libarchive diff --git a/sources b/sources index 83d8c0d..d055607 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e79be5310a6ceb4352b6da7044d1294f ark-4.9.97.tar.xz +098dd7fa37f0d1d684664ee4b5be2439 ark-4.9.98.tar.xz