diff --git a/.gitignore b/.gitignore index 2e65b42..2fab8d1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xfce4-screenshooter-1.7.9.tar.bz2 /xfce4-screenshooter-1.8.0.tar.bz2 /xfce4-screenshooter-1.8.1.tar.bz2 /xfce4-screenshooter-1.8.2.tar.bz2 +/xfce4-screenshooter-1.9.1.tar.bz2 diff --git a/sources b/sources index 11663ea..d075ea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a32ecc5566453a58f6a4ddd70649444 xfce4-screenshooter-1.8.2.tar.bz2 +SHA512 (xfce4-screenshooter-1.9.1.tar.bz2) = e95385f65dfe5fdd1d7045a18c9404ab400db9ddd06a35de2b11c0a955b390a6d278903a3558c135ee9744c8062860f491339b5d035f53cac74a49c366bd8bb2 diff --git a/xfce4-screenshooter-1.8.1-automake.patch b/xfce4-screenshooter-1.8.1-automake.patch deleted file mode 100644 index 7e5f076..0000000 --- a/xfce4-screenshooter-1.8.1-automake.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,6 @@ m4_define([xfce4_screenshooter_version_tag], []) - m4_define([xfce4_screenshooter_version], [xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(), [], [], [.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(), [git], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()], [xfce4_screenshooter_version_tag()])]) - - AC_INIT([xfce4-screenshooter], [xfce4_screenshooter_version], [http://bugzilla.xfce.org/], [xfce4-screenshooter]) --AC_USE_SYSTEM_EXTENSIONS() - - dnl *************************** - dnl *** Initialize automake *** -@@ -47,6 +46,7 @@ dnl ********************************** - dnl *** Check for standard headers *** - dnl ********************************** - AC_HEADER_STDC -+AC_USE_SYSTEM_EXTENSIONS() - - dnl *********************************** - dnl *** Check for required packages *** diff --git a/xfce4-screenshooter-1.8.1-fix-build.patch b/xfce4-screenshooter-1.8.1-fix-build.patch deleted file mode 100644 index 718572d..0000000 --- a/xfce4-screenshooter-1.8.1-fix-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 08053be7adc6d4a83191efed735c3f565bcbcf1f Mon Sep 17 00:00:00 2001 -From: Samuli Suominen -Date: Sat, 05 May 2012 15:13:45 +0000 -Subject: Fix panel plugin build. - -- Don't use a versioned library. -- Build as a module. -- Only export needed symbols. ---- -diff --git a/Makefile.am b/Makefile.am -index 45100fd..d0c0adb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -132,13 +132,19 @@ panel_plugin_libscreenshooterplugin_la_CFLAGS = \ - @SOUP_CFLAGS@ - - panel_plugin_libscreenshooterplugin_la_LDFLAGS = \ -+ -avoid-version \ -+ -module \ -+ -no-undefined \ -+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ -+ $(PLATFORM_LDFLAGS) -+ -+panel_plugin_libscreenshooterplugin_la_LIBADD = \ - @EXO_LIBS@ \ - @LIBXFCE4PANEL_LIBS@ \ - @GTHREAD_LIBS@ \ - @SOUP_LIBS@ \ -- @LIBXFCE4UI_LIBS@ -- --panel_plugin_libscreenshooterplugin_la_LIBADD = lib/libscreenshooter.la -+ @LIBXFCE4UI_LIBS@ \ -+ lib/libscreenshooter.la - - panel_plugin_libscreenshooterplugin_la_SOURCES = \ - panel-plugin/screenshooter-plugin.c --- -cgit v0.9.1 diff --git a/xfce4-screenshooter-1.8.1-increase-transparency.patch b/xfce4-screenshooter-1.8.1-increase-transparency.patch deleted file mode 100644 index 4b482be..0000000 --- a/xfce4-screenshooter-1.8.1-increase-transparency.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0b22517f1ea788ba5b71872e980034051921ab0e Mon Sep 17 00:00:00 2001 -From: Sergio Cipolla -Date: Thu, 06 Dec 2012 09:54:51 +0000 -Subject: Increase transparency of selection background (bug #9592). - ---- -diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c -index 52f7b5c..92e6f1b 100644 ---- a/lib/screenshooter-capture.c -+++ b/lib/screenshooter-capture.c -@@ -523,7 +523,7 @@ static gboolean cb_expose (GtkWidget *widget, - for (i = 0; i < n_rects; ++i) - { - /* Restore the transparent background */ -- cairo_set_source_rgba (cr, 0, 0, 0, 0.8); -+ cairo_set_source_rgba (cr, 0, 0, 0, 0.4); - gdk_cairo_rectangle (cr, &rects[i]); - cairo_fill (cr); - -@@ -548,7 +548,7 @@ static gboolean cb_expose (GtkWidget *widget, - - /* Draw the transparent background */ - cr = gdk_cairo_create (GDK_DRAWABLE (widget->window)); -- cairo_set_source_rgba (cr, 0, 0, 0, 0.8); -+ cairo_set_source_rgba (cr, 0, 0, 0, 0.4); - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); - - for (i = 0; i < n_rects; ++i) --- -cgit v0.9.1 diff --git a/xfce4-screenshooter.spec b/xfce4-screenshooter.spec index 06669f7..b176b01 100644 --- a/xfce4-screenshooter.spec +++ b/xfce4-screenshooter.spec @@ -3,23 +3,22 @@ # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179202 %global _hardened_build 1 -%global minorversion 1.8 +%global minorversion 1.9 %global xfceversion 4.12 Name: xfce4-screenshooter -Version: 1.8.2 -Release: 11%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: Screenshot utility for the Xfce desktop Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://archive.xfce.org/src/apps/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 -#VCS git:git://git.xfce.org/apps/xfce4-screenshooter -BuildRequires: exo-devel >= 0.5.0 -BuildRequires: libxfce4ui-devel >= 4.7.0 -BuildRequires: xfce4-panel-devel >= 4.4.0 +BuildRequires: exo-devel +BuildRequires: libxfce4ui-devel >= %{xfceversion} +BuildRequires: xfce4-panel-devel >= %{xfceversion} BuildRequires: libsoup-devel >= 2.26.0 BuildRequires: libXext-devel >= 1.0.0 BuildRequires: libXfixes-devel >= 4.0.0 @@ -49,10 +48,12 @@ panel. %prep %autosetup +# fix appdata location +sed -i 's/$(datadir)\/appdata/$(datadir)\/metainfo/' Makefile.in + # KDE and GNOME have their own screenshot utils echo "NotShowIn=KDE;GNOME;" >> src/xfce4-screenshooter.desktop.in.in - %build %configure --disable-static %make_build @@ -76,8 +77,7 @@ desktop-file-install \ # enable once bug is fixed: # https://bugzilla.xfce.org/show_bug.cgi?id=11481 -#appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml - +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml %files -f %{name}.lang %doc AUTHORS ChangeLog NEWS README TODO @@ -86,7 +86,7 @@ desktop-file-install \ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/applets-screenshooter.png %{_datadir}/icons/hicolor/scalable/apps/applets-screenshooter.svg -%{_datadir}/appdata/xfce4-screenshooter.appdata.xml +%{_datadir}/metainfo/xfce4-screenshooter.appdata.xml %{_mandir}/man1/*.1.* @@ -96,6 +96,9 @@ desktop-file-install \ %changelog +* Wed Mar 28 2018 Mukundan Ragavan - 1.9.1-1 +- Update to 1.9.1 + * Thu Feb 15 2018 Filipe Rosset - 1.8.2-11 - Spec cleanup / modernization