summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Rękorajski2019-08-25 19:37:50 (GMT)
committerJan Rękorajski2019-08-25 19:37:50 (GMT)
commit3dce972929e37c1b930cb654bb3601331b2c5eb5 (patch)
tree7736a78dd5d91d944d71d2817039910bc4274149
parent0421bad40f84ff88a10b06ad9c9d7e165f626419 (diff)
downloadxfce4-timer-plugin-3dce972929e37c1b930cb654bb3601331b2c5eb5.zip
xfce4-timer-plugin-3dce972929e37c1b930cb654bb3601331b2c5eb5.tar.gz
-rw-r--r--format-security.patch11
-rw-r--r--xfce4-timer-plugin.spec26
2 files changed, 12 insertions, 25 deletions
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index d77ddce..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfce4-timer-plugin-1.6.0/src/xfcetimer.c~ 2014-06-05 00:31:03.000000000 +0200
-+++ xfce4-timer-plugin-1.6.0/src/xfcetimer.c 2014-08-16 10:03:31.376720901 +0200
-@@ -190,7 +190,7 @@
-
- dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING,
-- GTK_BUTTONS_NONE, dialog_message);
-+ GTK_BUTTONS_NONE, "%s", dialog_message);
-
- gtk_window_set_title ((GtkWindow *) dialog, dialog_title);
-
diff --git a/xfce4-timer-plugin.spec b/xfce4-timer-plugin.spec
index 49eb603..b87d760 100644
--- a/xfce4-timer-plugin.spec
+++ b/xfce4-timer-plugin.spec
@@ -1,13 +1,12 @@
Summary: Xfce panel timer plugin
Summary(pl.UTF-8): Wtyczka panelu Xfce odliczająca czas
Name: xfce4-timer-plugin
-Version: 1.6.0
-Release: 3
+Version: 1.7.0
+Release: 1
License: GPL
Group: X11/Applications
-Source0: http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 3be2a4ccfb2af20441b1d25c2cea5f28
-Patch0: format-security.patch
+Source0: http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/%{name}-%{version}.tar.bz2
+# Source0-md5: 32e6a14e80bf9a93db2f2b3bfd7de920
URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -15,9 +14,9 @@ BuildRequires: intltool
BuildRequires: libtool
BuildRequires: libxfce4ui-devel
BuildRequires: pkgconfig
-BuildRequires: xfce4-dev-tools >= 4.4.0
-BuildRequires: xfce4-panel-devel >= 4.4.0
-Requires: xfce4-panel >= 4.4.0
+BuildRequires: xfce4-dev-tools >= 4.14.0
+BuildRequires: xfce4-panel-devel >= 4.14.0
+Requires: xfce4-panel >= 4.14.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -30,10 +29,8 @@ zdarzeniu, bądź po upływie określonego odcinka czasu.
%prep
%setup -q
-%patch0 -p1
%build
-%{__intltoolize}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
@@ -49,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
%find_lang %{name}
@@ -65,6 +62,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-timer
-%{_datadir}/xfce4/panel-plugins/xfce4-timer.desktop
-%{_iconsdir}/hicolor/*x*/apps/xfce4-timer.png
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libxfcetimer.so
+%{_iconsdir}/hicolor/*x*/apps/xfce4-timer-plugin.png
+%{_iconsdir}/hicolor/scalable/apps/xfce4-timer-plugin.svg
+%{_datadir}/xfce4/panel/plugins/xfce4-timer-plugin.desktop