From 9e325705262b2ee84e7ffa55f3c2af52d03c26da Mon Sep 17 00:00:00 2001 From: Jens Lody Date: Fri, 21 Aug 2015 01:10:45 +0200 Subject: [PATCH] spec-file: Remove dot before git in Release-tag. Use (conditional) file-triggers for schema compiling, introduced in fc24. Change Requires depending on the version we build the package for. Shorten the summary. --- gnome-shell-extension-panel-osd.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnome-shell-extension-panel-osd.spec b/gnome-shell-extension-panel-osd.spec index 5f57088..925ed0f 100644 --- a/gnome-shell-extension-panel-osd.spec +++ b/gnome-shell-extension-panel-osd.spec @@ -5,8 +5,8 @@ Name: gnome-shell-extension-panel-osd Version: 1 -Release: 0.0.%(date +%Y%m%d).%{checkout}%{?dist} -Summary: An extension to configure the place where notifications are shown +Release: 0.0.%(date +%Y%m%d)%{checkout}%{?dist} +Summary: Configure the place where notifications are shown Group: User Interface/Desktops @@ -17,7 +17,13 @@ Source0: https://github.com/jenslody/gnome-shell-extension-panel-osd/tarb BuildArch: noarch BuildRequires: autoconf, automake, glib2-devel, gnome-common >= 3.10.0, intltool -Requires: gnome-shell >= 3.10.0 +# In Fedora >= 24 %%{_datadir}/gnome-shell/extensions/ is owned by gnome-shell, +# before it was owned by gnome-shell-extension-common +%if 0%{?fedora} >= 24 +Requires: gnome-shell >= 3.12.0 +%else +Requires: gnome-shell-extension-common >= 3.12.0 +%endif %description @@ -29,13 +35,17 @@ messages at any (configurable) place on the (primary) monitor. %build NOCONFIGURE=1 ./autogen.sh -%configure --prefix=%{_prefix} +%configure --prefix=%{_prefix} GIT_VERSION=${checkout} make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} %find_lang %{name} +# Fedora uses file-triggers for some stuff (e.g. compile schemas) since fc24. +# Compiling schemas is the only thing done in %%postun and %%posttrans, so +# I decided to make both completely conditional. +%if 0%{?fedora} < 24 %postun if [ $1 -eq 0 ] ; then %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : @@ -43,6 +53,7 @@ fi %posttrans %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +%endif %files -f %{name}.lang %license COPYING @@ -51,6 +62,10 @@ fi %{_datadir}/gnome-shell/extensions/ %changelog +* Thu Aug 20 2015 Jens Lody - 1-0.1.20150821gitcb1f6f6 +- Remove dot before git in Release-tag. +- Use (conditional) file-triggers for schema compiling, introduced in fc24. + * Sun Jan 26 2014 Jens Lody - Initial package for Fedora of the panel-osd-extension fork