From ca9a66a73342871c72d53133fe7497564b16044f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 Aug 2014 08:20:50 -0500 Subject: [PATCH] 3.11.3-9 - update scriptlets - tighten subpkg dep - %check: validate appdata --- brasero.spec | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/brasero.spec b/brasero.spec index f641960..0c5496a 100644 --- a/brasero.spec +++ b/brasero.spec @@ -1,6 +1,6 @@ Name: brasero Version: 3.11.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia # see https://bugzilla.gnome.org/show_bug.cgi?id=683503 @@ -23,6 +23,7 @@ BuildRequires: libnotify-devel >= 0.7.0 BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: dbus-glib-devel >= 0.7.2 BuildRequires: libxslt +BuildRequires: libappstream-glib BuildRequires: libburn-devel >= 0.4.0 BuildRequires: libisofs-devel >= 0.6.4 BuildRequires: nautilus-devel >= 2.22.2 @@ -40,19 +41,14 @@ Requires: dvd+rw-tools Requires: cdrecord Requires: mkisofs Requires: cdda2wav -Requires: brasero-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %ifnarch s390 s390x Requires: cdrdao %endif - -Requires(post): shared-mime-info -Requires(postun): shared-mime-info Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Requires(post): /usr/bin/gtk-update-icon-cache -Requires(postun): /usr/bin/gtk-update-icon-cache %description Simple and easy to use CD/DVD burning application for the Gnome @@ -76,7 +72,7 @@ Group: User Interface/Desktops Provides: nautilus-cd-burner = %{version}-%{release} Obsoletes: nautilus-cd-burner < 2.25.4 -Requires: brasero = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description nautilus The %{name}-nautilus package contains the brasero nautilus extension. @@ -85,8 +81,7 @@ The %{name}-nautilus package contains the brasero nautilus extension. %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: nautilus-cd-burner-devel < 2.25.4 @@ -130,10 +125,13 @@ desktop-file-install --vendor "" \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-nautilus.desktop +%check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml + + %post -umask 022 -update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/mime/packages &> /dev/null || : update-desktop-database &> /dev/null ||: @@ -141,13 +139,13 @@ update-desktop-database &> /dev/null ||: %postun -umask 022 -update-mime-database %{_datadir}/mime &> /dev/null || : update-desktop-database &> /dev/null ||: if [ $1 -eq 0 ]; then touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + touch --no-create %{_datadir}/mime/packages &> /dev/null || : + update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : fi @@ -157,6 +155,7 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %pre @@ -197,6 +196,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Tue Aug 12 2014 Rex Dieter - 3.11.3-9 +- update scriptlets +- tighten subpkg dep +- %%check: validate appdata + * Sat Aug 2 2014 Peter Robinson 3.11.3-8 - Base package should depend on -libs