Attachment 910485 Details for Bug 1107271 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-automake-1.14-1107271.patch (text/plain), 3.91 KB, created by Yaakov Selkowitz on 2014-06-19 17:38:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-19 17:38:49 UTC

Size: 3.91 KB

patch

obsolete

>From b9f076b7df0f4592d1197c96946c6aed6eb1dcd4 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Thu, 19 Jun 2014 12:38:28 -0500
>Subject: [PATCH] Fix FTBFS with automake-1.14 (#1107271)
>
>---
> xfce4-screenshooter-1.8.1-automake.patch | 18 ++++++++++++++++++
> xfce4-screenshooter.spec                 | 17 +++++++----------
> 2 files changed, 25 insertions(+), 10 deletions(-)
> create mode 100644 xfce4-screenshooter-1.8.1-automake.patch
>
>diff --git a/xfce4-screenshooter-1.8.1-automake.patch b/xfce4-screenshooter-1.8.1-automake.patch
>new file mode 100644
>index 0000000..7e5f076
>--- /dev/null
>+++ b/xfce4-screenshooter-1.8.1-automake.patch
>@@ -0,0 +1,18 @@
>+--- 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.spec b/xfce4-screenshooter.spec
>index 5c4c901..d9071e6 100644
>--- a/xfce4-screenshooter.spec
>+++ b/xfce4-screenshooter.spec
>@@ -12,7 +12,7 @@
> 
> Name:           xfce4-screenshooter
> Version:        1.8.1
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        Screenshot utility for the Xfce desktop
> 
> Group:          User Interface/Desktops
>@@ -25,8 +25,8 @@ Source0:        http://archive.xfce.org/src/apps/%{name}/%{minorversion}/%{name}
> Patch0:         xfce4-screenshooter-1.8.1-fix-build.patch
> # http://git.xfce.org/apps/xfce4-screenshooter/commit/?id=0b22517f
> Patch1:         xfce4-screenshooter-1.8.1-increase-transparency.patch
>-
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+# Fix FTBFS with automake-1.14
>+Patch2:         xfce4-screenshooter-1.8.1-automake.patch
> 
> BuildRequires:  exo-devel >= 0.5.0
> BuildRequires:  libxfce4ui-devel >= 4.7.0
>@@ -62,6 +62,7 @@ panel.
> %setup -q
> %patch0 -p1 -b .fix-build
> %patch1 -p1 -b .increase-transparency
>+%patch2 -p1 -b .automake114
> 
> # KDE and GNOME have their own screenshot utils
> echo "NotShowIn=KDE;GNOME;" >> src/xfce4-screenshooter.desktop.in.in
>@@ -76,7 +77,6 @@ make %{?_smp_mflags} V=1
> 
> 
> %install
>-rm -rf %{buildroot}
> make install DESTDIR=%{buildroot} INSTALL='install -p'
> 
> # remove la file
>@@ -93,10 +93,6 @@ desktop-file-install \
>         %{buildroot}%{_datadir}/applications/%{name}.desktop
> 
> 
>-%clean
>-rm -rf %{buildroot}
>-
>-
> %post
> touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
> 
>@@ -113,7 +109,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> 
> 
> %files -f %{name}.lang
>-%defattr(-,root,root,-)
> %doc AUTHORS COPYING ChangeLog NEWS README TODO
> %{_bindir}/%{name}
> %{_datadir}/applications/%{name}.desktop
>@@ -125,12 +120,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> 
> 
> %files plugin
>-%defattr(-,root,root,-)
> %{_libdir}/xfce4/panel/plugins/*.so
> %{_datadir}/xfce4/panel/plugins/*.desktop
> 
> 
> %changelog
>+* Thu Jun 19 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.8.1-4
>+- Fix FTBFS with automake-1.14 (#1107271)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1107271: 906533 | 906534 | 906535 | 910485