Accepting request 261387 from GNOME:Next

Cleanup - can be accepted despite the mangling of changes

OBS-URL: https://build.opensuse.org/request/show/261387
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2014-11-13 23:30:48 +00:00 committed by Git OBS Bridge
parent 24b35c8e7a
commit 9d1603ac5a
4 changed files with 20 additions and 17 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0bc97a925f3db50d63f3bee77acf43f9936c0d4b5b53ec77ee0843898e692aa3
size 2112680

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aabc9d8764c841c5678da3743e6cce87d4ef3923c41e242ef733a92b19cf3509
size 2114164

View File

@ -1,12 +1,13 @@
-------------------------------------------------------------------
Thu Nov 6 22:36:46 UTC 2014 - dimstar@opensuse.org
Fri Oct 31 16:46:45 UTC 2014 - dimstar@opensuse.org
- BuildIgnore brp-extract-appdata: As this packageis not desktop
relevant, we can do without brp-extract-appdata. This helps a
great deal in bootstrapping: otherwise we end up with
brp-extract-appdata requiring appstream-glib, which can't be
built, as brp-extract-appdata is a support package in the
buildroot.
- Update to 0.3.1.git.20141031:
+ Fix make check run in chroot.
+ Merge appdata-validate.
- Enable make check.
- Obsolete and provide appdata-tools by the -devel package:
appdata-tools has been merged into appstream glib and the
resulting binary is shipped in our -devel package.
-------------------------------------------------------------------
Thu Oct 30 10:41:51 UTC 2014 - dimstar@opensuse.org

View File

@ -20,7 +20,7 @@
%define _build_from_vcs 1
Name: appstream-glib
Version: 0.3.1.git.20141030.7a5f76a
Version: 0.3.1.git.20141031.f9c620c
Release: 0
Summary: AppStream Abstraction Library
License: LGPL-2.1+
@ -49,12 +49,6 @@ BuildRequires: pkgconfig(libarchive)
BuildRequires: pkgconfig(libsoup-2.4) >= 2.24
BuildRequires: pkgconfig(rpm)
BuildRequires: pkgconfig(sqlite3)
# As this packageis not desktop relevant, we can do without
# brp-extract-appdata. This helps a great deal in
# bootstrapping: otherwise we end up with brp-extract-appdata
# requiring appstream-glib, which can't be built, as
# brp-extract-appdata is a support package in the buildroot.
#!BuildIgnore: brp-extract-appdata
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -129,6 +123,9 @@ Requires: libappstream-builder7 = %{version}
Requires: libappstream-glib7 = %{version}
Requires: typelib-1_0-AppStreamBuilder-1_0 = %{version}
Requires: typelib-1_0-AppStreamGlib-1_0 = %{version}
# appdata-tools was consumed into appstream-glib and is no longer maintained upstream
Obsoletes: appdata-tools < 0.1.9
Provides: appdata-tools = 0.1.9
%description devel
This library provides GObjects and helper methods to make it easy to read and write AppStream metadata.
@ -164,6 +161,9 @@ rm %{buildroot}%{_datadir}/installed-tests/appstream-glib/*.test
find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name}
%check
make check
%post -n libappstream-glib7 -p /sbin/ldconfig
%postun -n libappstream-glib7 -p /sbin/ldconfig
@ -202,6 +202,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files devel
%defattr(-,root,root)
%{_bindir}/appdata-validate
%{_datadir}/aclocal/appdata-xml.m4
%{_datadir}/aclocal/appstream-xml.m4
%{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir
%{_datadir}/gir-1.0/AppStreamGlib-1.0.gir