summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2014-06-29 14:53:08 (GMT)
committerJakub Bogusz2014-06-29 14:53:08 (GMT)
commit1ef69b50f9eeb848b98b788c9776458575e3582f (patch)
tree46a828edb98e3654da9b0a7d93d4259e9b66c0d4
parentfc7c04832d134b3ccbfb84ab4ce3f9c59fadee83 (diff)
downloadlibhif-1ef69b50f9eeb848b98b788c9776458575e3582f.zip
libhif-1ef69b50f9eeb848b98b788c9776458575e3582f.tar.gz
- updated to 0.1.1auto/th/libhif-0.1.1-1
-rw-r--r--libhif-rpm5.patch22
-rw-r--r--libhif.spec4
2 files changed, 13 insertions, 13 deletions
diff --git a/libhif-rpm5.patch b/libhif-rpm5.patch
index 095539c..60949c1 100644
--- a/libhif-rpm5.patch
+++ b/libhif-rpm5.patch
@@ -226,8 +226,8 @@
const gchar *filename,
GError **error);
---- libhif-0.1.0/libhif/hif-transaction.c.orig 2014-06-10 12:06:55.000000000 +0200
-+++ libhif-0.1.0/libhif/hif-transaction.c 2014-06-15 08:04:22.977149465 +0200
+--- libhif-0.1.1/libhif/hif-transaction.c.orig 2014-06-20 14:04:57.000000000 +0200
++++ libhif-0.1.1/libhif/hif-transaction.c 2014-06-29 16:50:29.724613004 +0200
@@ -30,7 +30,8 @@
#include "config.h"
@@ -264,16 +264,16 @@
priv->timer = g_timer_new ();
priv->pkgs_to_download = g_ptr_array_new_with_free_func ((GDestroyNotify) hy_package_free);
}
-@@ -371,7 +369,7 @@ hif_transaction_check_untrusted (HifTran
+@@ -370,7 +368,7 @@ hif_transaction_check_untrusted (HifTran
}
/* check file */
-- ret = hif_keyring_check_untrusted_file (priv->keyring,
-+ ret = hif_keyring_check_untrusted_file (
+- if (!hif_keyring_check_untrusted_file (priv->keyring,
++ if (!hif_keyring_check_untrusted_file (
filename,
- error);
- if (!ret)
-@@ -439,15 +437,6 @@ hif_transaction_rpmcb_type_to_string (co
+ error))
+ return FALSE;
+@@ -437,15 +435,6 @@ hif_transaction_rpmcb_type_to_string (co
case RPMCALLBACK_SCRIPT_ERROR:
type = "script-error";
break;
@@ -289,7 +289,7 @@
}
return type;
}
-@@ -735,7 +724,6 @@ hif_transaction_ts_progress_cb (const vo
+@@ -733,7 +722,6 @@ hif_transaction_ts_progress_cb (const vo
/* don't do anything */
break;
@@ -297,7 +297,7 @@
case RPMCALLBACK_UNINST_STOP:
/* phase complete */
-@@ -749,8 +737,6 @@ hif_transaction_ts_progress_cb (const vo
+@@ -747,8 +735,6 @@ hif_transaction_ts_progress_cb (const vo
case RPMCALLBACK_UNPACK_ERROR:
case RPMCALLBACK_CPIO_ERROR:
case RPMCALLBACK_SCRIPT_ERROR:
@@ -306,7 +306,7 @@
case RPMCALLBACK_UNKNOWN:
case RPMCALLBACK_REPACKAGE_PROGRESS:
case RPMCALLBACK_REPACKAGE_START:
-@@ -1292,15 +1278,7 @@ hif_transaction_commit (HifTransaction *
+@@ -1290,15 +1276,7 @@ hif_transaction_commit (HifTransaction *
/* setup the transaction */
tmp = hif_context_get_install_root (priv->context);
diff --git a/libhif.spec b/libhif.spec
index 543f36a..19767e9 100644
--- a/libhif.spec
+++ b/libhif.spec
@@ -1,12 +1,12 @@
Summary: Simple package library built on top of hawkey and librepo
Summary(pl.UTF-8): Prosta biblioteka obsługi pakietów oparta na bibliotekach hawkey i librepo
Name: libhif
-Version: 0.1.0
+Version: 0.1.1
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 50d2fcc5cd61d93af70168a4a4ea1e1b
+# Source0-md5: 8a78b6257614f4bf33bf10b8665f8a4a
Patch0: %{name}-rpm5.patch
URL: https://github.com/hughsie/libhif
BuildRequires: glib2-devel >= 1:2.36.0