[packages/appstream-glib/DEVEL] - updated to 0.3.0 (new sonames, small API compatibility break) - updated rpm5 patch
qboosh
qboosh at pld-linux.org
Fri Sep 5 15:57:17 CEST 2014
commit 50cd6ceb9d9d2716aeb7ad0a45df6ac5ae9656a3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 5 15:57:32 2014 +0200
- updated to 0.3.0 (new sonames, small API compatibility break)
- updated rpm5 patch
appstream-glib-rpm5.patch | 69 ++++++++++++++++++++++++++++++++++++-----------
appstream-glib.spec | 8 +++---
2 files changed, 58 insertions(+), 19 deletions(-)
---
diff --git a/appstream-glib.spec b/appstream-glib.spec
index a93754f..3aa0ffc 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.2.6
+Version: 0.3.0
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 2a86155462ef49747ca6f27f857aa1a9
+# Source0-md5: f4be91093be4d43856258766684e7744
Patch0: %{name}-rpm5.patch
Patch1: %{name}-pc.patch
URL: http://people.freedesktop.org/~hughsient/appstream-glib/
@@ -195,7 +195,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS MAINTAINERS NEWS README.md
%attr(755,root,root) %{_bindir}/appstream-util
%attr(755,root,root) %{_libdir}/libappstream-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libappstream-glib.so.1
+%attr(755,root,root) %ghost %{_libdir}/libappstream-glib.so.7
%{_libdir}/girepository-1.0/AppStreamGlib-1.0.typelib
%{_mandir}/man1/appstream-util.1*
@@ -223,7 +223,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/appstream-builder
%attr(755,root,root) %{_libdir}/libappstream-builder.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libappstream-builder.so.1
+%attr(755,root,root) %ghost %{_libdir}/libappstream-builder.so.7
%{_libdir}/girepository-1.0/AppStreamBuilder-1.0.typelib
%dir %{_libdir}/asb-plugins
%attr(755,root,root) %{_libdir}/asb-plugins/libasb_plugin_absorb.so
diff --git a/appstream-glib-rpm5.patch b/appstream-glib-rpm5.patch
index 109f588..047bbf6 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.2.6/libappstream-builder/asb-package-rpm.c.orig 2014-09-01 15:57:32.000000000 +0200
-+++ appstream-glib-0.2.6/libappstream-builder/asb-package-rpm.c 2014-09-04 16:55:26.028784594 +0200
+--- 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
@@ -33,7 +33,7 @@
#include <archive.h>
#include <archive_entry.h>
@@ -39,7 +39,7 @@
#include <rpm/rpmts.h>
#include "as-cleanup.h"
-@@ -239,6 +239,36 @@ asb_package_rpm_set_source (AsbPackage *
+@@ -225,6 +225,36 @@ asb_package_rpm_set_source (AsbPackage *
asb_package_set_source_pkgname (pkg, srcrpm);
}
@@ -74,27 +74,66 @@
+#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
+
/**
- * asb_package_rpm_ensure_simple:
+ * asb_package_rpm_ensure_nevra:
**/
-@@ -251,7 +281,7 @@ asb_package_rpm_ensure_simple (AsbPackag
+@@ -235,7 +265,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
+ AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
rpmtd td;
- /* get the simple stuff */
- td = rpmtdNew ();
+ td = malloc (sizeof (*td));
headerGet (priv->h, RPMTAG_NAME, td, HEADERGET_MINMEM);
asb_package_set_name (pkg, rpmtdGetString (td));
headerGet (priv->h, RPMTAG_VERSION, td, HEADERGET_MINMEM);
-@@ -268,7 +298,7 @@ asb_package_rpm_ensure_simple (AsbPackag
- asb_package_rpm_set_license (pkg, rpmtdGetString (td));
+@@ -246,7 +276,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
+ asb_package_set_arch (pkg, rpmtdGetString (td));
+ headerGet (priv->h, RPMTAG_EPOCH, td, HEADERGET_MINMEM);
+ asb_package_set_epoch (pkg, rpmtdGetNumber (td));
+- rpmtdFree (td);
++ free (td);
+ return TRUE;
+ }
+
+@@ -260,10 +290,10 @@ asb_package_rpm_ensure_source (AsbPackag
+ AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
+ rpmtd td;
+
+- td = rpmtdNew ();
++ td = malloc (sizeof (*td));
headerGet (priv->h, RPMTAG_SOURCERPM, td, HEADERGET_MINMEM);
asb_package_rpm_set_source (pkg, rpmtdGetString (td));
- rpmtdFree (td);
+ free (td);
- return ret;
+ return TRUE;
+ }
+
+@@ -277,10 +307,10 @@ asb_package_rpm_ensure_url (AsbPackage *
+ AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
+ rpmtd td;
+
+- td = rpmtdNew ();
++ td = malloc (sizeof (*td));
+ headerGet (priv->h, RPMTAG_URL, td, HEADERGET_MINMEM);
+ asb_package_set_url (pkg, rpmtdGetString (td));
+- rpmtdFree (td);
++ free (td);
+ return TRUE;
+ }
+
+@@ -294,10 +324,10 @@ asb_package_rpm_ensure_license (AsbPacka
+ AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
+ rpmtd td;
+
+- td = rpmtdNew ();
++ td = malloc (sizeof (*td));
+ headerGet (priv->h, RPMTAG_LICENSE, td, HEADERGET_MINMEM);
+ asb_package_rpm_set_license (pkg, rpmtdGetString (td));
+- rpmtdFree (td);
++ free (td);
+ return TRUE;
}
-@@ -341,7 +371,7 @@ asb_package_rpm_ensure_releases (AsbPack
+@@ -370,7 +400,7 @@ asb_package_rpm_ensure_releases (AsbPack
/* read out the file list */
for (i = 0; i < 3; i++)
@@ -103,7 +142,7 @@
/* get the ChangeLog info */
headerGet (priv->h, RPMTAG_CHANGELOGTIME, td[0], HEADERGET_MINMEM);
headerGet (priv->h, RPMTAG_CHANGELOGNAME, td[1], HEADERGET_MINMEM);
-@@ -356,7 +386,7 @@ asb_package_rpm_ensure_releases (AsbPack
+@@ -385,7 +415,7 @@ asb_package_rpm_ensure_releases (AsbPack
}
for (i = 0; i < 3; i++) {
rpmtdFreeData (td[i]);
@@ -112,7 +151,7 @@
}
return TRUE;
}
-@@ -378,7 +408,7 @@ asb_package_rpm_ensure_deps (AsbPackage
+@@ -407,7 +437,7 @@ asb_package_rpm_ensure_deps (AsbPackage
_cleanup_strv_free_ gchar **deps = NULL;
/* read out the dep list */
@@ -121,7 +160,7 @@
rc = headerGet (priv->h, RPMTAG_REQUIRENAME, td, HEADERGET_MINMEM);
if (!rc) {
ret = FALSE;
-@@ -406,7 +436,7 @@ asb_package_rpm_ensure_deps (AsbPackage
+@@ -435,7 +465,7 @@ asb_package_rpm_ensure_deps (AsbPackage
asb_package_set_deps (pkg, deps);
out:
rpmtdFreeData (td);
@@ -130,7 +169,7 @@
return ret;
}
-@@ -428,7 +458,7 @@ asb_package_rpm_ensure_filelists (AsbPac
+@@ -461,7 +491,7 @@ asb_package_rpm_ensure_filelists (AsbPac
/* read out the file list */
for (i = 0; i < 3; i++)
@@ -139,7 +178,7 @@
rc = headerGet (priv->h, RPMTAG_DIRNAMES, td[0], HEADERGET_MINMEM);
if (rc)
rc = headerGet (priv->h, RPMTAG_BASENAMES, td[1], HEADERGET_MINMEM);
-@@ -463,7 +493,7 @@ asb_package_rpm_ensure_filelists (AsbPac
+@@ -496,7 +526,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/50cd6ceb9d9d2716aeb7ad0a45df6ac5ae9656a3
More information about the pld-cvs-commit
mailing list