diff --git a/.gitignore b/.gitignore index 15898f3..427680a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clawsker-0.7.2.tar.gz /clawsker-0.7.11.tar.gz /clawsker-0.7.13.tar.gz +/clawsker-0.7.14.tar.xz diff --git a/clawsker-0.7.14-undef.patch b/clawsker-0.7.14-undef.patch new file mode 100644 index 0000000..36b120e --- /dev/null +++ b/clawsker-0.7.14-undef.patch @@ -0,0 +1,14 @@ +diff -Nur clawsker-0.7.14-orig/clawsker clawsker-0.7.14/clawsker +--- clawsker-0.7.14-orig/clawsker 2016-08-16 17:27:47.000000000 +0200 ++++ clawsker-0.7.14/clawsker 2016-08-18 18:34:58.562582913 +0200 +@@ -467,7 +467,9 @@ + my $pagei = int (($type[2] - $type[1]) / 10); + my $gentry = Gtk2::SpinButton->new_with_range ($type[1], $type[2], $pagei); + $gentry->set_numeric (TRUE); +- $gentry->set_value ($HPVALUE{$name}); ++ if (defined($HPVALUE{$name})) { ++ $gentry->set_value ($HPVALUE{$name}); ++ } + $$hash{$key}[GUI] = $gentry; + $gentry->signal_connect('value-changed' => sub { + my ($w, $e) = @_; diff --git a/clawsker.desktop b/clawsker.desktop deleted file mode 100644 index f00c5ae..0000000 --- a/clawsker.desktop +++ /dev/null @@ -1,23 +0,0 @@ -[Desktop Entry] -Name=Claws Mail Hidden Preferences -Name[de]=Verborgene Einstellungen von Claws Mail -Name[es]=Preferencias ocultas de Claws Mail -Name[fr]=Options cachées de Claws Mail -Name[id]=Preferensi tersembunyi Claws Mail -Name[it]=Opzioni nascoste di Claws Mail -Name[sr@latin]=Skrivene postavke za Claws Mail -Name[sr]=Скривене поставке за Claws Mail -GenericName=Clawsker -Comment=A Claws Mail Tweaker -Comment[de]=Ein Editor für die verborgenen Einstellungen von Claws Mail -Comment[es]=Un ajustador de Claws Mail -Comment[fr]=Éditeur d'options cachées de Claws Mail -Comment[id]=Pengulik Claws Mail -Comment[it]=Un tweaker per Claws Mail -Comment[sr@latin]=Fino štelovanje skrivenih postavki za Claws Mail -Comment[sr]=Фино штеловање скривених поставки за Claws Mail -Exec=clawsker -Icon=claws-mail -Terminal=false -Type=Application -Categories=GTK;Settings;X-GNOME-NetworkSettings; diff --git a/clawsker.spec b/clawsker.spec index 3f77a32..6e3edac 100644 --- a/clawsker.spec +++ b/clawsker.spec @@ -1,28 +1,24 @@ # Review at https://bugzilla.redhat.com/show_bug.cgi?id=620191 Name: clawsker -Version: 0.7.13 -Release: 3%{?dist} +Version: 0.7.14 +Release: 1%{?dist} Summary: Dialog to edit Claws Mail's hidden preferences Group: Applications/Internet License: GPLv3+ URL: http://www.claws-mail.org/clawsker -Source0: http://www.claws-mail.org/tools/%{name}-%{version}.tar.gz -Source1: %{name}.desktop +Source0: http://www.claws-mail.org/tools/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?fedora} > 21 -# Perl prov/req depfinder broken by regression in file format detection -# fixed with an update: -BuildRequires: file >= 5.22-5.fc22 -%endif +# uninitialized value warning if running with Claws Mail older than 3.14.0, +# because "master_passphrase_pbkdf2_rounds" is a new setting +Patch0: clawsker-0.7.14-undef.patch BuildArch: noarch BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: /usr/bin/pod2man -BuildRequires: perl-generators Requires: claws-mail %description @@ -35,6 +31,7 @@ Claws Mail is a fast and lightweight Mail User Agent by the Claws Mail Team. %prep %setup -q +%patch0 -p1 %build @@ -45,26 +42,43 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} PREFIX=%{_prefix} -desktop-file-install \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE1} - - %find_lang %{name} + %clean rm -rf %{buildroot} +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files -f %{name}.lang %doc AUTHORS ChangeLog.old NEWS README %license COPYING %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Thu Aug 18 2016 Michael Schwendt - 0.7.14-1 +- Update to 0.7.14. +- Patch out the "uninitialized value" warning for line 470. +- Use the included/installed desktop file. +- Add icon cache scriptlets for the new icon. +- Remove the explicit "file" BR again, not needed anymore. + * Wed Feb 03 2016 Fedora Release Engineering - 0.7.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 0cfde1f..2ef0196 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f90aa443a7e6733ae7541f740b2e14fa clawsker-0.7.13.tar.gz +3b30c3e7774539667eee7df5c880dfd8 clawsker-0.7.14.tar.xz