[packages/appstream-glib/DEVEL] - updated to 0.3.4 - updated rpm5 patch - now it includes functionality of (now deprecated) appdata-

qboosh qboosh at pld-linux.org
Tue Jan 20 20:53:34 CET 2015


commit 4775b2799b53b653c3cd07a393995913cb63876c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jan 20 20:55:19 2015 +0100

    - updated to 0.3.4
    - updated rpm5 patch
    - now it includes functionality of (now deprecated) appdata-tools

 appstream-glib-rpm5.patch | 38 +++++++++++++++++++++++++++++---------
 appstream-glib.spec       |  8 ++++++--
 2 files changed, 35 insertions(+), 11 deletions(-)
---
diff --git a/appstream-glib.spec b/appstream-glib.spec
index 0aa8f5e..e758c81 100644
--- a/appstream-glib.spec
+++ b/appstream-glib.spec
@@ -1,12 +1,12 @@
 Summary:	GLib Objects and helper methods for reading and writing AppStream metadata
 Summary(pl.UTF-8):	Obiekty GLiba i metody pomocnicze do odczytu i zapisu metadanych AppStream
 Name:		appstream-glib
-Version:	0.3.0
+Version:	0.3.4
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	f4be91093be4d43856258766684e7744
+# Source0-md5:	b3652e289d5fade9efbc07b9eabff488
 Patch0:		%{name}-rpm5.patch
 Patch1:		%{name}-pc.patch
 URL:		http://people.freedesktop.org/~hughsient/appstream-glib/
@@ -39,6 +39,8 @@ BuildRequires:	xz
 Requires:	glib2 >= 1:2.16.1
 Requires:	gdk-pixbuf2 >= 2.14
 Requires:	libsoup >= 2.24
+Provides:	appdata-tools = %{version}
+Obsoletes:	appdata-tools < 0.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -195,10 +197,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS MAINTAINERS NEWS README.md
+%attr(755,root,root) %{_bindir}/appdata-validate
 %attr(755,root,root) %{_bindir}/appstream-util
 %attr(755,root,root) %{_libdir}/libappstream-glib.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libappstream-glib.so.7
 %{_libdir}/girepository-1.0/AppStreamGlib-1.0.typelib
+%{_aclocaldir}/appdata-xml.m4
 %{_mandir}/man1/appstream-util.1*
 
 %files devel
diff --git a/appstream-glib-rpm5.patch b/appstream-glib-rpm5.patch
index 047bbf6..87c2693 100644
--- a/appstream-glib-rpm5.patch
+++ b/appstream-glib-rpm5.patch
@@ -28,8 +28,8 @@
  AppStreamBuilder_1_0_gir_FILES = $(introspection_sources)
  INTROSPECTION_GIRS += AppStreamBuilder-1.0.gir
  
---- appstream-glib-0.3.0/libappstream-builder/asb-package-rpm.c.orig	2014-08-29 15:35:27.000000000 +0200
-+++ appstream-glib-0.3.0/libappstream-builder/asb-package-rpm.c	2014-09-04 21:37:12.294741594 +0200
+--- appstream-glib-0.3.4/libappstream-builder/asb-package-rpm.c.orig	2014-12-22 17:02:12.000000000 +0100
++++ appstream-glib-0.3.4/libappstream-builder/asb-package-rpm.c	2015-01-20 18:51:42.939675985 +0100
 @@ -33,7 +33,7 @@
  #include <archive.h>
  #include <archive_entry.h>
@@ -120,7 +120,27 @@
  	return TRUE;
  }
  
-@@ -294,10 +324,10 @@ asb_package_rpm_ensure_license (AsbPacka
+@@ -290,14 +320,18 @@ asb_package_rpm_ensure_url (AsbPackage *
+ static gboolean
+ asb_package_rpm_ensure_vcs (AsbPackage *pkg, GError **error)
+ {
++#ifdef RPMTAG_VCS
+ 	AsbPackageRpm *pkg_rpm = ASB_PACKAGE_RPM (pkg);
+ 	AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
+ 	rpmtd td;
+ 
+-	td = rpmtdNew ();
++	td = malloc (sizeof (*td));
+ 	headerGet (priv->h, RPMTAG_VCS, td, HEADERGET_MINMEM);
+ 	asb_package_set_vcs (pkg, rpmtdGetString (td));
+ 	rpmtdFree (td);
++#else
++	asb_package_set_vcs (pkg, NULL);
++#endif
+ 	return TRUE;
+ }
+ 
+@@ -311,10 +345,10 @@ asb_package_rpm_ensure_license (AsbPacka
  	AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
  	rpmtd td;
  
@@ -133,7 +153,7 @@
  	return TRUE;
  }
  
-@@ -370,7 +400,7 @@ asb_package_rpm_ensure_releases (AsbPack
+@@ -387,7 +421,7 @@ asb_package_rpm_ensure_releases (AsbPack
  
  	/* read out the file list */
  	for (i = 0; i < 3; i++)
@@ -142,7 +162,7 @@
  	/* get the ChangeLog info */
  	headerGet (priv->h, RPMTAG_CHANGELOGTIME, td[0], HEADERGET_MINMEM);
  	headerGet (priv->h, RPMTAG_CHANGELOGNAME, td[1], HEADERGET_MINMEM);
-@@ -385,7 +415,7 @@ asb_package_rpm_ensure_releases (AsbPack
+@@ -402,7 +436,7 @@ asb_package_rpm_ensure_releases (AsbPack
  	}
  	for (i = 0; i < 3; i++) {
  		rpmtdFreeData (td[i]);
@@ -151,7 +171,7 @@
  	}
  	return TRUE;
  }
-@@ -407,7 +437,7 @@ asb_package_rpm_ensure_deps (AsbPackage
+@@ -424,7 +458,7 @@ asb_package_rpm_ensure_deps (AsbPackage
  	_cleanup_strv_free_ gchar **deps = NULL;
  
  	/* read out the dep list */
@@ -160,7 +180,7 @@
  	rc = headerGet (priv->h, RPMTAG_REQUIRENAME, td, HEADERGET_MINMEM);
  	if (!rc) {
  		ret = FALSE;
-@@ -435,7 +465,7 @@ asb_package_rpm_ensure_deps (AsbPackage
+@@ -452,7 +486,7 @@ asb_package_rpm_ensure_deps (AsbPackage
  	asb_package_set_deps (pkg, deps);
  out:
  	rpmtdFreeData (td);
@@ -169,7 +189,7 @@
  	return ret;
  }
  
-@@ -461,7 +491,7 @@ asb_package_rpm_ensure_filelists (AsbPac
+@@ -478,7 +512,7 @@ asb_package_rpm_ensure_filelists (AsbPac
  
  	/* read out the file list */
  	for (i = 0; i < 3; i++)
@@ -178,7 +198,7 @@
  	rc = headerGet (priv->h, RPMTAG_DIRNAMES, td[0], HEADERGET_MINMEM);
  	if (rc)
  		rc = headerGet (priv->h, RPMTAG_BASENAMES, td[1], HEADERGET_MINMEM);
-@@ -496,7 +526,7 @@ asb_package_rpm_ensure_filelists (AsbPac
+@@ -513,7 +547,7 @@ asb_package_rpm_ensure_filelists (AsbPac
  out:
  	for (i = 0; i < 3; i++) {
  		rpmtdFreeData (td[i]);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/appstream-glib.git/commitdiff/4775b2799b53b653c3cd07a393995913cb63876c



More information about the pld-cvs-commit mailing list