From d297b7664be8a373ec9f03b874d1ee84574a2db8 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Oct 23 2020 21:34:38 +0000 Subject: Update to latest git --- diff --git a/nemo-extensions.spec b/nemo-extensions.spec index aa42194..19bc7cf 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -1,14 +1,18 @@ # Don't bother building debug packages as koji bitches about n-v-r from nemo package %global debug_package %{nil} +%global commit e0f0f9219b86eac0d5ba8e6e7dce22b61b6d50a5 +%global date 20200922 +%global shortcommit0 %(c=%{commit}; echo ${c:0:7}) + Name: nemo-extensions Version: 4.6.0 -Release: 4%{?dist} +Release: 5%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: Extensions for Nemo License: GPLv2+ and LGPLv2 URL: https://github.com/linuxmint/%{name} -Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz BuildRequires: desktop-file-utils BuildRequires: gpgme-devel @@ -25,11 +29,7 @@ BuildRequires: intltool BuildRequires: meson BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(libnotify) -%if 0%{?fedora} >= 34 -BuildRequires: pkgconfig(gjs-1.0) >= 1.56.0 -%else BuildRequires: pkgconfig(cjs-1.0) >= 4.6.0 -%endif BuildRequires: pkgconfig(xreader-view-1.5) BuildRequires: pkgconfig(libmusicbrainz5) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) @@ -155,11 +155,7 @@ Seahorse nemo is an extension for nemo which allows encryption and decryption of OpenPGP files using GnuPG. %prep -%autosetup -p1 -%if 0%{?fedora} >= 34 -sed -i -e 's@cjs-1.0@gjs-1.0@g' nemo-preview/configure.ac -sed -i -e 's@cjs/gjs.h@gjs/gjs.h@g' nemo-preview/src/main.c -%endif +%autosetup -p1 -n %{name}-%{commit} %build pushd nemo-audio-tab @@ -173,7 +169,7 @@ popd pushd nemo-fileroller NOCONFIGURE=1 ./autogen.sh %configure -%make_build V=1 +%make_build popd pushd nemo-python @@ -186,10 +182,8 @@ pushd nemo-terminal popd pushd nemo-preview -NOCONFIGURE=1 ./autogen.sh -intltoolize -f -%configure -%make_build V=1 +%meson +%meson_build popd pushd nemo-emblems @@ -199,7 +193,7 @@ popd pushd nemo-image-converter NOCONFIGURE=1 gnome-autogen.sh %configure -%make_build V=1 +%make_build popd pushd nemo-compare @@ -209,7 +203,7 @@ popd pushd nemo-seahorse NOCONFIGURE=1 ./autogen.sh %configure -%make_build V=1 +%make_build popd %install @@ -234,7 +228,7 @@ pushd nemo-terminal popd pushd nemo-preview -%make_install +%meson_install popd pushd nemo-emblems @@ -256,7 +250,6 @@ popd # remove useless libtool archive files rm %{buildroot}/%{_libdir}/nemo/extensions-3.0/libnemo-*.la rm %{buildroot}/%{_libdir}/nemo/extensions-3.0/libnemo-*.a -rm %{buildroot}/%{_libdir}/nemo-preview/libnemo-preview-1.0.la rm -rf %{buildroot}/%{_datadir}/doc/nemo-python/ @@ -348,6 +341,9 @@ desktop-file-install \ %{_mandir}/man1/nemo-seahorse-tool.1.* %changelog +* Fri Oct 23 2020 Leigh Scott - 4.6.0-5.20200922gite0f0f92 +- Update to latest git + * Sun Sep 20 2020 Leigh Scott - 4.6.0-4 - Switch to gjs f34+ diff --git a/sources b/sources index ae40c33..ed24288 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nemo-extensions-4.6.0.tar.gz) = b496732b984f3d4f3fc93dc96ef65b711eaa55bb9c777c19ab224e7ab138f8c6784aa2f16e9a0cc77e79581ed7a04a439955369804dbf930b835df042d7dbd32 +SHA512 (nemo-extensions-e0f0f9219b86eac0d5ba8e6e7dce22b61b6d50a5.tar.gz) = b3f05206fa395f870ee6f93f1206ac016fad7bbffd2ff16e072ac380818fab2df22dcabe7ce4ed2269e29f5abd9e20953d2278e9697f92ef369f5aa4511e7279