commit 570736cd4f6b79de7800186e3ac99e2c241d8779
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 16 15:13:48 2014 +0100
- updated to 0.1.6
- updated rpm5 patch
libhif-rpm5.patch | 28 ++++++++++++++--------------
libhif.spec | 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/libhif.spec b/libhif.spec
index 9f94779..14405df 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.4
+Version: 0.1.6
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: d2631de331a6c95df37ac3ef0c02ad00
+# Source0-md5: 652b4b152bba618ebee6e3dffddfa2a2
Patch0: %{name}-rpm5.patch
URL: https://github.com/hughsie/libhif
BuildRequires: glib2-devel >= 1:2.36.0
diff --git a/libhif-rpm5.patch b/libhif-rpm5.patch
index 60949c1..7c0a53e 100644
--- a/libhif-rpm5.patch
+++ b/libhif-rpm5.patch
@@ -1,5 +1,5 @@
---- libhif-0.1.0/libhif/hif-context.c.orig 2014-06-04 10:15:54.000000000
+0200
-+++ libhif-0.1.0/libhif/hif-context.c 2014-06-15 07:25:26.340531502 +0200
+--- libhif-0.1.6/libhif/hif-context.c.orig 2014-11-10 17:12:02.000000000
+0100
++++ libhif-0.1.6/libhif/hif-context.c 2014-11-16 15:10:10.086198310 +0100
@@ -31,7 +31,8 @@
#include "config.h"
@@ -10,7 +10,16 @@
#include <hawkey/query.h>
#include <hawkey/packagelist.h>
-@@ -801,13 +802,17 @@ hif_context_setup (HifContext *context,
+@@ -1133,7 +1134,7 @@ hif_context_setup (HifContext *context,
+ "alphaev68", "alphaev7", "alphapca56", NULL }
},
+ { "arm", { "armv5tejl", "armv5tel", "armv6l", "armv7l",
NULL } },
+ { "armhfp", { "armv7hl", "armv7hnl", NULL } },
+- { "i386", { "i386", "athlon", "geode", "i386",
++ { "i386", { "i386", "athlon", "geode", "pentium2",
"pentium3", "pentium4",
+ "i486", "i586", "i686", NULL } },
+ { "ia64", { "ia64", NULL } },
+ { "noarch", { "noarch", NULL } },
+@@ -1196,9 +1197,9 @@ hif_context_setup (HifContext *context,
}
/* get info from RPM */
@@ -20,17 +29,8 @@
- rpmGetArchInfo (&value, NULL);
+ value = rpmExpand ("%{_target_cpu}", NULL);
priv->arch_info = g_strdup (value);
- if (g_strcmp0 (value, "i486") == 0 ||
- g_strcmp0 (value, "i586") == 0 ||
-- g_strcmp0 (value, "i686") == 0) {
-+ g_strcmp0 (value, "i686") == 0 ||
-+ g_strcmp0 (value, "athlon") == 0 ||
-+ g_strcmp0 (value, "pentium2") == 0 ||
-+ g_strcmp0 (value, "pentium3") == 0 ||
-+ g_strcmp0 (value, "pentium4") == 0) {
- value = "i386";
- } else if (g_strcmp0 (value, "armv7l") == 0 ||
- g_strcmp0 (value, "armv6l") == 0 ||
+
+ /* find the base architecture */
--- libhif-0.1.0/libhif/hif-keyring.c.orig 2014-06-04 10:15:54.000000000
+0200
+++ libhif-0.1.0/libhif/hif-keyring.c 2014-06-15 07:51:30.257165572 +0200
@@ -35,7 +35,9 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libhif.git/commitdiff/570736cd4f6b79de7800186e3ac99e2c241d8779
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
