rpms/grilo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c9s
Branches Tags
rpms:c8s
rpms:c10s
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8
rpms:c8-beta
rpms:imports/c9/grilo-0.3.13-7.el9
rpms:imports/c9-beta/grilo-0.3.13-7.el9
rpms:imports/c8/grilo-0.3.6-3.el8
rpms:imports/c8-beta/grilo-0.3.6-3.el8
rpms:imports/c8-beta/grilo-0.3.6-2.el8
rpms:imports/c8/grilo-0.3.6-2.el8
rpms:imports/c8s/grilo-0.3.6-3.el8
...
pull from: rpms:c8s
Branches Tags
rpms:c10s
rpms:c9s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:c8
rpms:c8-beta
rpms:imports/c9/grilo-0.3.13-7.el9
rpms:imports/c9-beta/grilo-0.3.13-7.el9
rpms:imports/c8/grilo-0.3.6-3.el8
rpms:imports/c8-beta/grilo-0.3.6-3.el8
rpms:imports/c8-beta/grilo-0.3.6-2.el8
rpms:imports/c8/grilo-0.3.6-2.el8
rpms:imports/c8s/grilo-0.3.6-3.el8

No commits in common. "c9s" and "c8s" have entirely different histories.
c9s ... c8s

7 changed files with 72 additions and 174 deletions
Show Stats Expand all files Collapse all files

33
.gitignore vendored
View File

@ -1,33 +1,2 @@
/grilo-0.1.15.tar.bz2
/grilo-0.1.16.tar.xz
/grilo-0.1.17.tar.xz
/grilo-0.1.18.tar.xz
/grilo-0.1.19.tar.xz
/grilo-0.2.0.tar.xz
/grilo-0.2.1.tar.xz
/grilo-0.2.2.tar.xz
/grilo-0.2.3.tar.xz
/grilo-0.2.4.tar.xz
/grilo-0.2.5.tar.xz
/grilo-0.2.6.tar.xz
/grilo-0.2.7.tar.xz
/grilo-0.2.9.tar.xz
/grilo-0.2.10.tar.xz
/grilo-0.2.11.tar.xz
/grilo-0.2.12.tar.xz
/grilo-0.2.13.tar.xz
/grilo-0.2.15.tar.xz
/grilo-0.3.0.tar.xz
/grilo-0.3.1.tar.xz
/grilo-0.3.2.tar.xz
/grilo-0.3.3.tar.xz
/grilo-0.3.4.tar.xz
/grilo-0.3.5.tar.xz
SOURCES/grilo-0.3.6.tar.xz
/grilo-0.3.6.tar.xz
/grilo-0.3.7.tar.xz
/grilo-0.3.8.tar.xz
/grilo-0.3.9.tar.xz
/grilo-0.3.10.tar.xz
/grilo-0.3.11.tar.xz
/grilo-0.3.12.tar.xz
/grilo-0.3.13.tar.xz

1
.grilo.metadata
View File

@ -1 +0,0 @@
aa5f1fd521727c4aeb02b7c6af46930b12183083 grilo-0.3.13.tar.xz

40
0001-Include-file-to-build-docs-with-meson.patch Normal file
View File

@ -0,0 +1,40 @@
From a3ba6b49575c74890e38462c41aa27ada74047be Mon Sep 17 00:00:00 2001
From: Victor Toso <me@victortoso.com>
Date: Fri, 27 Jul 2018 20:25:44 +0200
Subject: [PATCH] Include file to build docs with meson
Include missing file from tarball in order to switch to meson
without missing the docs
---
doc/grilo/grilo.types | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 doc/grilo/grilo.types
diff --git a/doc/grilo/grilo.types b/doc/grilo/grilo.types
new file mode 100644
index 0000000..ce9358c
--- /dev/null
+++ b/doc/grilo/grilo.types
@@ -0,0 +1,19 @@
+% add a _get_type for every GObject whose properties and signals you want
+% documented
+% add the relevant includes to be able to call those _get_type functions
+
+% adding a get_type here will:
+% - change output file name from grilo-(whatever).html to (whatever).html
+% - document properties and signals
+
+#include <grilo.h>
+
+grl_data_get_type
+grl_config_get_type
+grl_related_keys_get_type
+grl_media_get_type
+grl_plugin_get_type
+grl_source_get_type
+grl_registry_get_type
+grl_caps_get_type
+grl_operation_options_get_type
--
2.17.1

59
0001-build-Clarify-LGPLv2.1-or-later-license.patch
View File

@ -1,59 +0,0 @@
From 89537b8c4bae8857078de5d084f79ffe532a7ba8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 21 Jun 2021 14:16:37 +0200
Subject: [PATCH 1/2] build: Clarify LGPLv2.1 or later license
The COPYING file by itself isn't enough to know under which license the
project is released, as a combined work.
Clarify this in the build system and the README.
---
README.md | 5 +++++
doc/grilo/overview.xml | 3 ++-
meson.build | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index c6fe38e..16f9453 100644
--- a/README.md
+++ b/README.md
@@ -89,4 +89,9 @@ ninja -C build
./build/tools/grilo-test-ui/grilo-test-ui-0.3
```
+## License
+
+grilo is available under the [GNU Lesser General Public License v2.1 or later](https://spdx.org/licenses/LGPL-2.1-or-later.html).
+Check the sources themselves for individual copyrights and licenses.
+
Enjoy!
diff --git a/doc/grilo/overview.xml b/doc/grilo/overview.xml
index aa169ae..52b8e41 100644
--- a/doc/grilo/overview.xml
+++ b/doc/grilo/overview.xml
@@ -99,7 +99,8 @@ developers.
</para>
<para>
-Grilo is licensed under the GNU Lesser General Public License (LGPL).
+Grilo is licensed under the GNU Lesser General Public License (LGPL)
+version 2.1 or later.
</para>
</section>
diff --git a/meson.build b/meson.build
index cf12454..f76d790 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@ project('grilo', 'c',
'c_std=gnu99',
'warning_level=1'
],
- license: 'LGPL 2.1',
+ license: 'LGPL-2.1-or-later',
meson_version: '>= 0.46.0')
grilo_version = meson.project_version()
--
2.31.1

2
gating.yaml
View File

@ -1,6 +1,6 @@
--- !Policy
product_versions:
- rhel-9
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

109
grilo.spec
View File

@ -2,18 +2,22 @@
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name: grilo
Version: 0.3.13
Release: 7%{?dist}
Version: 0.3.6
Release: 3%{?dist}
Summary: Content discovery framework
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/Grilo
Source0: https://download.gnome.org/sources/grilo/%{release_version}/grilo-%{version}.tar.xz
Patch0001: 0001-Include-file-to-build-docs-with-meson.patch
# https://gitlab.gnome.org/GNOME/grilo/-/merge_requests/78
Patch0002: 0002-net-Fix-TLS-cert-validation-not-being-done-for-any-n.patch
BuildRequires: meson
BuildRequires: git
BuildRequires: chrpath
BuildRequires: gettext
BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: vala >= 0.27.1
BuildRequires: gtk-doc
BuildRequires: gobject-introspection-devel >= 0.9.0
@ -22,13 +26,9 @@ BuildRequires: libsoup-devel
BuildRequires: glib2-devel
# For the test UI
BuildRequires: gtk3-devel
BuildRequires: liboauth-devel
BuildRequires: totem-pl-parser-devel
# https://gitlab.gnome.org/GNOME/grilo/-/merge_requests/77
Patch0: 0001-build-Clarify-LGPLv2.1-or-later-license.patch
# https://gitlab.gnome.org/GNOME/grilo/-/merge_requests/78
Patch1: 0002-net-Fix-TLS-cert-validation-not-being-done-for-any-n.patch
%description
Grilo is a framework that provides access to different sources of
multimedia content, using a pluggable system.
@ -37,6 +37,9 @@ This package contains the core library and elements.
%package devel
Summary: Libraries/include files for Grilo framework
Requires: %{name}%{?_isa} = %{version}-%{release}
# Provide upgrade path for -vala subpackage that was merged into -devel during
# the F23 cycle
Obsoletes: grilo-vala < 0.2.13
%description devel
Grilo is a framework that provides access to different sources of
@ -58,13 +61,25 @@ general and API documentation.
mkdir -p $RPM_BUILD_ROOT%{_libdir}/grilo-%{release_version}/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/grilo-%{release_version}/plugins/
# Remove rpath
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/grl-inspect-%{release_version}
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/grl-launch-%{release_version}
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/grilo-test-ui-%{release_version}
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgrlnet-%{release_version}.so.*
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgrlpls-%{release_version}.so
# Remove files that will not be packaged
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_bindir}/grilo-simple-playlist
%find_lang grilo
%ldconfig_scriptlets
%files -f grilo.lang
%license COPYING
%doc AUTHORS NEWS README.md TODO
%doc AUTHORS NEWS README TODO
%{_libdir}/*.so.*
%{_libdir}/girepository-1.0/
%{_bindir}/grl-inspect-%{release_version}
@ -85,86 +100,20 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/grilo-%{release_version}/plugins/
%{_datadir}/vala/
%changelog
* Mon Aug 23 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.3.13-7
- Drop the BuildRequires on liboauth
Resolves: #1996880
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.13-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Jun 28 2021 Bastien Nocera <bnocera@redhat.com> - 0.3.13-5
+ grilo-0.3.13-5
- Clarify license
* Wed Aug 25 2021 Bastien Nocera <bnocera@redhat.com> - 0.3.6-3
+ grilo-0.3.6-3
- Fix TLS not being validated correctly
- Resolves: rhbz#1976719
- Resolves: rhbz#1997234
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.13-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Sep 09 2020 Kalev Lember <klember@redhat.com> - 0.3.13-2
- Rebuild to include in GNOME megaupdate
* Thu Sep 3 2020 Victor Toso <victortoso@redhat.com> - 0.3.13-1
- Update to 0.3.13
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Feb 14 2020 Victor Toso <victortoso@redhat.com> - 0.3.12-1
- Update to 0.3.12
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 10 2020 Kalev Lember <klember@redhat.com> - 0.3.11-1
- Update to 0.3.11
* Thu Nov 28 2019 Kalev Lember <klember@redhat.com> - 0.3.10-2
- Fix the build with totem-pl-parser 3.26.4
* Thu Sep 12 2019 Victor Toso <victortoso@redhat.com> - 0.3.10-1
- Update to 0.3.10
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 18 2019 Kalev Lember <klember@redhat.com> - 0.3.9-2
- BR gettext, instead of intltool
* Wed Jul 17 2019 Victor Toso <victortoso@redhat.com> - 0.3.9-1
- Update to 0.3.9, fixes introspection regression
* Mon Jul 15 2019 Kalev Lember <klember@redhat.com> - 0.3.8-1
- Update to 0.3.8
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Nov 19 2018 Victor Toso <victortoso@redhat.com> - 0.3.7-1
- Update to 0.3.7
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.3.6-4
- Rebuild with fixed binutils
* Fri Jul 27 2018 Victor Toso <victortoso@redhat.com> - 0.3.6-3
* Sat Jul 28 2018 Victor Toso <victortoso@redhat.com> - 0.3.6-2
- Switch to meson build system
* Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.6-2
- Rebuild for new binutils
* Fri Jul 27 2018 Victor Toso <victortoso@redhat.com> - 0.3.6-1
- Update to 0.3.6
* Tue Jul 17 2018 Victor Toso <victortoso@redhat.com> - 0.3.5-1
* Wed Jul 18 2018 Victor Toso <victortoso@redhat.com> - 0.3.5-1
- Update to 0.3.5
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (grilo-0.3.13.tar.xz) = b229b9b7524c1be63ed8891a9438844ebb87013074b394330f25316feb015040b304cd98bf3c89dc3248e6898c587a5e51666776a5b4ba5026a80ee8ad3e6d01
SHA512 (grilo-0.3.6.tar.xz) = 175cf61a43aea8456a41f4dce7694fac50e854cf6340ed0671f233e6188fa34347c1e7308aac99bc49d081c36747776b9a8c1c5cc7c0be00a1df2c9d015d8849