From f160ff1c37dc2d5f0ed2c605ab3e2b0dccec37d2 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@googlemail.com>
Date: Mar 03 2019 21:21:47 +0000
Subject: Fix F30 FTBFS


---

diff --git a/devilspie-0.22-dsofix.patch b/devilspie-0.22-dsofix.patch
index 9c8f6df..6d389d4 100644
--- a/devilspie-0.22-dsofix.patch
+++ b/devilspie-0.22-dsofix.patch
@@ -1,11 +1,9 @@
---- devilspie-0.22.orig/src/Makefile.in	2007-11-24 14:50:20.000000000 +0100
-+++ devilspie-0.22/src/Makefile.in	2010-02-25 15:25:07.000000000 +0100
-@@ -133,7 +133,7 @@
- INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LTLIBOBJS = @LTLIBOBJS@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -46,4 +46,4 @@
+ 
+ AM_CFLAGS = @WARN_CFLAGS@
+ 
+-LDADD = ${WNCK_LIBS}
++LDADD = ${WNCK_LIBS} -lX11
+
diff --git a/devilspie.spec b/devilspie.spec
index 41505ac..5afd798 100644
--- a/devilspie.spec
+++ b/devilspie.spec
@@ -1,6 +1,6 @@
 Name:           devilspie
 Version:        0.22
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        A window-matching utility
 
 License:        GPLv2+
@@ -10,6 +10,8 @@ Patch0:         devilspie-0.22-dsofix.patch
 Patch1:         devilspie-0.20.2-manpage.patch
 # from https://bugzilla.gnome.org/show_bug.cgi?id=636890
 Patch2:         devilspie-0.22-gtk-2.22.1.patch
+
+BuildRequires:  automake
 BuildRequires:  gcc
 BuildRequires:  libwnck-devel
 BuildRequires:  libpng-devel
@@ -30,23 +32,29 @@ window.
 %patch0 -p1 -b .dsofix
 %patch1 -p1 -b .manpage
 %patch2 -p0 -b .gtk-2.22.1
+NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --enable-compile-warnings=no
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 %find_lang %{name}
 
 %files -f %{name}.lang
-%doc ChangeLog README AUTHORS NEWS COPYING TODO
+%doc ChangeLog README AUTHORS NEWS TODO
+%license COPYING
 %{_bindir}/devilspie
 %{_mandir}/man1/devilspie.1.gz
 
 %changelog
+* Sun Mar 03 2019 Leigh Scott <leigh123linux@googlemail.com> - 0.22-22
+- Redo dso linking patch
+- Run autogen.sh
+- Clean up spec file
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.22-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild