diff --git a/.gitignore b/.gitignore index 75a1cdb..1b3139d 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /pluma-1.19.1.tar.xz /pluma-1.19.2.tar.xz /pluma-1.19.3.tar.xz +/pluma-1.20.0.tar.xz diff --git a/pluma.spec b/pluma.spec index 01433b0..cecf4ce 100644 --- a/pluma.spec +++ b/pluma.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.19 +%global branch 1.20 # Settings used for build from snapshots. %{!?rel_build:%global commit c1ca209172a8b3a0751ac0a1e2dbec33c1894290} @@ -14,9 +14,9 @@ Summary: Text editor for the MATE desktop Name: pluma -Version: %{branch}.3 +Version: %{branch}.0 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 1%{?dist} %else Release: 0.5%{?git_rel}%{?dist} %endif @@ -93,7 +93,11 @@ Development files for pluma %prep -%setup -q%{!?rel_build:n %{name}-%{commit}} +%if 0%{?rel_build} +%autosetup -p1 +%else +%autosetup -n %{name}-%{commit} -p1 +%endif %if 0%{?rel_build} # for releases @@ -131,18 +135,6 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' %find_lang %{name} --with-gnome --all-name -%post -/usr/bin/update-desktop-database &> /dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi -/usr/bin/update-desktop-database &> /dev/null || : - -%posttrans -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - %post data /bin/touch --no-create %{_datadir}/pluma/icons &> /dev/null || : @@ -181,6 +173,12 @@ fi %changelog +* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 +- update to 1.20.0 release +- drop desktop-database rpm scriptlet +- drop GSettings Schema rpm scriptlet +- switch to autosetup + * Fri Feb 09 2018 Fedora Release Engineering - 1.19.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 55fe3c7..b3bd451 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pluma-1.19.3.tar.xz) = a62c92b38fb21fd896b64c6dfeb06d6388ff5c901d38eeccdc8340b1fb1ad305ab117560192f52575ef0c1b853b7bb9152c48c33b617ad4a6ae89b113ff9fc5c +SHA512 (pluma-1.20.0.tar.xz) = 31ecf70cacedf9598518aa761449dad5fd25728a68feb06526849c304c5e08db635e072a1196b865c40a81e71eefdacdb62a16e7cdca609f63d48aa7cd14c7db