From ca0e4150060594b4ac196e0474df1f4b6eddb679 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jul 04 2013 12:44:33 +0000 Subject: import ark-4.10.5-1.el7.src.rpm --- diff --git a/.ark.metadata b/.ark.metadata new file mode 100644 index 0000000..cc33b26 --- /dev/null +++ b/.ark.metadata @@ -0,0 +1 @@ +8c50a864af0dbf62e3df46414c7bf9cd1d8c8620 SOURCES/ark-4.10.5.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/ark-4.7.80-namelink_skip.patch b/SOURCES/ark-4.7.80-namelink_skip.patch new file mode 100644 index 0000000..e10b852 --- /dev/null +++ b/SOURCES/ark-4.7.80-namelink_skip.patch @@ -0,0 +1,12 @@ +diff -up ark-4.7.80/kerfuffle/CMakeLists.txt.namelink_skip ark-4.7.80/kerfuffle/CMakeLists.txt +--- ark-4.7.80/kerfuffle/CMakeLists.txt.namelink_skip 2011-11-04 09:36:35.000000000 -0500 ++++ ark-4.7.80/kerfuffle/CMakeLists.txt 2011-11-28 14:14:34.361344532 -0600 +@@ -33,7 +33,7 @@ endif (NOT WIN32) + + set_target_properties(kerfuffle PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) + +-install(TARGETS kerfuffle ${INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS kerfuffle ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) + + install(FILES kerfufflePlugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) + install(FILES ark.kcfg DESTINATION ${KCFG_INSTALL_DIR}) diff --git a/SOURCES/ark-4.9.97-improve_subfolder_autodetection.patch b/SOURCES/ark-4.9.97-improve_subfolder_autodetection.patch new file mode 100644 index 0000000..212eeb1 --- /dev/null +++ b/SOURCES/ark-4.9.97-improve_subfolder_autodetection.patch @@ -0,0 +1,80 @@ +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 ((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 (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 ++++ b/kerfuffle/archive.cpp +@@ -196,6 +196,16 @@ QString Archive::fileName() const + return m_iface->filename(); + } + ++QString Archive::fileBaseName() const ++{ ++ QString base = QFileInfo(m_iface->filename()).completeBaseName(); ++ //special case for tar.gz/bzip2 files ++ if (base.right(4).toUpper() == QLatin1String(".TAR")) { ++ base.chop(4); ++ } ++ return base; ++} ++ + void Archive::onAddFinished(KJob* job) + { + //if the archive was previously a single folder archive and an add job +@@ -217,15 +227,7 @@ void Archive::onListFinished(KJob* job) + m_isPasswordProtected = ljob->isPasswordProtected(); + m_subfolderName = ljob->subfolderName(); + if (m_subfolderName.isEmpty()) { +- QFileInfo fi(fileName()); +- QString base = fi.completeBaseName(); +- +- //special case for tar.gz/bzip2 files +- if (base.right(4).toUpper() == QLatin1String(".TAR")) { +- base.chop(4); +- } +- +- m_subfolderName = base; ++ m_subfolderName = fileBaseName(); + } + + m_hasBeenListed = true; +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 (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 (m_basePath.isEmpty()) { diff --git a/SOURCES/ark-4.9.97-r107635.patch b/SOURCES/ark-4.9.97-r107635.patch new file mode 100644 index 0000000..c958399 --- /dev/null +++ b/SOURCES/ark-4.9.97-r107635.patch @@ -0,0 +1,11 @@ +diff -up ark-4.9.97/app/mainwindow.cpp.r107635 ark-4.9.97/app/mainwindow.cpp +--- ark-4.9.97/app/mainwindow.cpp.r107635 2012-12-17 09:07:06.000000000 -0600 ++++ ark-4.9.97/app/mainwindow.cpp 2013-01-05 13:17:50.206588420 -0600 +@@ -69,7 +69,6 @@ MainWindow::~MainWindow() + if (m_recentFilesAction) { + m_recentFilesAction->saveEntries(KGlobal::config()->group("Recent Files")); + } +- delete m_part; + m_part = 0; + } + diff --git a/SPECS/ark.spec b/SPECS/ark.spec new file mode 100644 index 0000000..43db821 --- /dev/null +++ b/SPECS/ark.spec @@ -0,0 +1,244 @@ +%if 0%{?fedora} +%global p7zip 1 +%endif + +Name: ark +Summary: Archive manager +Version: 4.10.5 +Release: 1%{?dist} + +License: GPLv2+ +URL: http://utils.kde.org/projects/ark +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz + +## upstreamable patches +# libkerfuffle namelink_skip +Patch50: ark-4.7.80-namelink_skip.patch +# https://git.reviewboard.kde.org/r/107635/ +Patch52: ark-4.9.97-r107635.patch +# https://git.reviewboard.kde.org/r/107634/ +Patch53: ark-4.9.97-improve_subfolder_autodetection.patch + +## upstream patches + +BuildRequires: bzip2-devel +BuildRequires: desktop-file-utils +BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: kde-baseapps-devel >= %{version} +BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(liblzma) +BuildRequires: zlib-devel +# need only for ark unit tests +#BuildRequires: pkgconfig(QJson) + +# when split occured +Conflicts: kdeutils-common < 6:4.7.80 + +Provides: ark-part = %{version}-%{release} + +Obsoletes: kdeutils-ark < 6:4.7.80 +Provides: kdeutils-ark = 6:%{version}-%{release} + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%if 0%{?p7zip} +Requires: p7zip-plugins +%endif + +%description +Ark is a program for managing various archive formats. + +Archives can be viewed, extracted, created and modified from within Ark. +The program can handle various formats such as tar, gzip, bzip2, zip, +rar and lha (if appropriate command-line programs are installed). + +%package libs +Summary: Runtime libraries for %{name} +# libkerfuffle is BSD, plugins are mix of BSD and GPLv2+ +License: BSD and GPLv2+ +Requires: %{name} = %{version}-%{release} +Obsoletes: kdeutils-ark-libs < 6:4.7.80 +Provides: kdeutils-ark-libs = 6:%{version}-%{release} +%description libs +%{summary}. + + +%prep +%setup -q -n %{name}-%{version} + +%patch50 -p1 -b .namelink_skip +%patch52 -p1 -b .r107635 +%patch53 -p1 -b .improve_subfolder_autodetection + + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + + +%install +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + +%find_lang ark --with-kde --without-mo + + +%check +desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/ark.desktop + + +%post +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : + +%posttrans +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +update-desktop-database -q &> /dev/null ||: + +%postun +if [ $1 -eq 0 ] ; then +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +update-desktop-database -q &> /dev/null ||: +fi + +%files -f ark.lang +%doc COPYING +%{_kde4_bindir}/ark +%{_kde4_appsdir}/ark/ +%{_kde4_datadir}/config.kcfg/ark.kcfg +%{_kde4_datadir}/kde4/services/ark*.desktop +%{_kde4_datadir}/kde4/services/ServiceMenus/ark*.desktop +%{_kde4_datadir}/applications/kde4/ark.desktop +%{_kde4_iconsdir}/hicolor/*/apps/ark.* +%{_kde4_libdir}/kde4/arkpart.so +%{_kde4_libdir}/kde4/libextracthere.so +%{_mandir}/man1/ark.1* + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + +%files libs +%{_kde4_libdir}/libkerfuffle.so.4* +%{_kde4_libdir}/kde4/kerfuffle_*.so +%{_kde4_datadir}/kde4/services/kerfuffle*.desktop +%{_kde4_datadir}/kde4/servicetypes/kerfufflePlugin.desktop + + +%changelog +* Sun Jun 30 2013 Than Ngo - 4.10.5-1 +- 4.10.5 + +* Sat Jun 01 2013 Rex Dieter - 4.10.4-1 +- 4.10.4 + +* Mon May 06 2013 Than Ngo - 4.10.3-1 +- 4.10.3 + +* Wed Apr 24 2013 Than Ngo - 4.10.2-2 +- requires p7zip only in fedora + +* Sun Mar 31 2013 Rex Dieter - 4.10.2-1 +- 4.10.2 + +* Sat Mar 02 2013 Rex Dieter - 4.10.1-1 +- 4.10.1 + +* Fri Feb 01 2013 Rex Dieter - 4.10.0-1 +- 4.10.0 + +* 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 + +* Sat Jan 05 2013 Rex Dieter - 4.9.97-2 +- Ark needs to know about application/x-source-rpm (#885316) +- Improve subfolder autodetection (kde review 107634) +- Don't delete the KPart in the MainWindow destructor (kde review 107635) + +* Fri Jan 04 2013 Rex Dieter - 4.9.97-1 +- 4.9.97 + +* Thu Dec 20 2012 Rex Dieter - 4.9.95-1 +- 4.9.95 + +* Tue Dec 04 2012 Rex Dieter - 4.9.90-1 +- 4.9.90 + +* Mon Dec 03 2012 Than Ngo - 4.9.4-1 +- 4.9.4 + +* Sat Nov 03 2012 Rex Dieter - 4.9.3-1 +- 4.9.3 + +* Sat Sep 29 2012 Rex Dieter - 4.9.2-1 +- 4.9.2 + +* Mon Sep 03 2012 Than Ngo - 4.9.1-1 +- 4.9.1 + +* Thu Jul 26 2012 Lukas Tinkl - 4.9.0-1 +- 4.9.0 + +* Wed Jul 18 2012 Fedora Release Engineering - 4.8.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 11 2012 Rex Dieter - 4.8.97-1 +- 4.8.97 + +* Tue Jul 10 2012 Rex Dieter 4.8.95-2 +- update builddeps + +* Thu Jun 28 2012 Rex Dieter - 4.8.95-1 +- 4.8.95 + +* Sat Jun 09 2012 Rex Dieter - 4.8.90-1 +- 4.8.90 + +* Fri Jun 01 2012 Jaroslav Reznik - 4.8.80-1 +- 4.8.80 + +* Mon Apr 30 2012 Jaroslav Reznik - 4.8.3-1 +- 4.8.3 + +* Fri Mar 30 2012 Rex Dieter - 4.8.2-1 +- 4.8.2 + +* Mon Mar 05 2012 Jaroslav Reznik - 4.8.1-1 +- 4.8.1 + +* Thu Jan 26 2012 Tomas Bzatek - 4.8.0-3 +- Rebuilt for new libarchive + +* Tue Jan 24 2012 Jaroslav Reznik - 4.8.0-2 +- respin + +* Sun Jan 22 2012 Rex Dieter - 4.8.0-1 +- 4.8.0 + +* Wed Jan 04 2012 Rex Dieter - 4.7.97-1 +- 4.7.97 + +* Thu Dec 22 2011 Radek Novacek - 4.7.95-1 +- 4.7.95 + +* Thu Dec 15 2011 Rex Dieter 4.7.90-2 +- %%doc COPYING + +* Thu Dec 08 2011 Rex Dieter 4.7.90-1 +- 4.7.90 + +* Sat Nov 26 2011 Rex Dieter 4.7.80-1 +- first try +