rpms/kdeutils/F-11 kdeutils-4.4.2-old-libarchive.patch, NONE, 1.1 kdeutils.spec, 1.188, 1.189

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27999/F-11

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-4.4.2-old-libarchive.patch 
Log Message:
* Sat Apr 03 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.2-1.1
- use the xz and lzma formats only if compiled in libarchive (upstream patch)

kdeutils-4.4.2-old-libarchive.patch:
 libarchivehandler.cpp |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE kdeutils-4.4.2-old-libarchive.patch ---
Index: ark/plugins/libarchive/libarchivehandler.cpp
===================================================================
--- ark/plugins/libarchive/libarchivehandler.cpp	(revision 1108318)
+++ ark/plugins/libarchive/libarchivehandler.cpp	(revision 1108319)
@@ -341,12 +341,16 @@
         } else if (filename().right(3).toUpper() == "BZ2") {
             kDebug() << "Detected bzip2 compression for new file";
             ret = archive_write_set_compression_bzip2(arch_writer);
+#ifdef ARCHIVE_COMPRESSION_XZ
         } else if (filename().right(2).toUpper() == "XZ") {
             kDebug() << "Detected xz compression for new file";
             ret = archive_write_set_compression_xz(arch_writer);
+#endif
+#ifdef ARCHIVE_COMPRESSION_LZMA
         } else if (filename().right(4).toUpper() == "LZMA") {
             kDebug() << "Detected lzma compression for new file";
             ret = archive_write_set_compression_lzma(arch_writer);
+#endif
         } else if (filename().right(3).toUpper() == "TAR") {
             kDebug() << "Detected no compression for new file (pure tar)";
             ret = archive_write_set_compression_none(arch_writer);
@@ -372,12 +376,16 @@
         case ARCHIVE_COMPRESSION_BZIP2:
             ret = archive_write_set_compression_bzip2(arch_writer);
             break;
+#ifdef ARCHIVE_COMPRESSION_XZ
         case ARCHIVE_COMPRESSION_XZ:
             ret = archive_write_set_compression_xz(arch_writer);
             break;
+#endif
+#ifdef ARCHIVE_COMPRESSION_LZMA
         case ARCHIVE_COMPRESSION_LZMA:
             ret = archive_write_set_compression_lzma(arch_writer);
             break;
+#endif
         case ARCHIVE_COMPRESSION_NONE:
             ret = archive_write_set_compression_none(arch_writer);
             break;
@@ -505,12 +513,16 @@
     case ARCHIVE_COMPRESSION_BZIP2:
         ret = archive_write_set_compression_bzip2(arch_writer);
         break;
+#ifdef ARCHIVE_COMPRESSION_XZ
     case ARCHIVE_COMPRESSION_XZ:
         ret = archive_write_set_compression_xz(arch_writer);
         break;
+#endif
+#ifdef ARCHIVE_COMPRESSION_LZMA
     case ARCHIVE_COMPRESSION_LZMA:
         ret = archive_write_set_compression_lzma(arch_writer);
         break;
+#endif
     case ARCHIVE_COMPRESSION_NONE:
         ret = archive_write_set_compression_none(arch_writer);
         break;


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- kdeutils.spec	3 Apr 2010 17:15:55 -0000	1.188
+++ kdeutils.spec	3 Apr 2010 20:12:58 -0000	1.189
@@ -6,7 +6,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.4.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        KDE Utilities
 
 Group:          Applications/System
@@ -19,9 +19,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # add support for automatic printer driver installation (Tim Waugh, #576660)
 Patch0:         kdeutils-4.4.1-printer-applet-InstallPrinterDrivers.patch
 
-## upstreamed patches
-
-## upstream fixes
+## upstream patches
+# 4.4 branch:
+# use the xz and lzma formats only if compiled in libarchive
+Patch100:       kdeutils-4.4.2-old-libarchive.patch
 
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -91,6 +92,7 @@ Requires: system-config-printer-libs
 %if 0%{?fedora} > 12
 %patch0 -p1 -b .InstallPrinterDrivers
 %endif
+%patch100 -p0 -b .old-libarchive
 
 
 %build
@@ -214,6 +216,9 @@ fi
 
 
 %changelog
+* Sat Apr 03 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.2-1.1
+- use the xz and lzma formats only if compiled in libarchive (upstream patch)
+
 * Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 6:4.4.2-1
 - 4.4.2