[audtty] In response to "[ACTION REQUIRED v4] Retiring packages for F-18" thread on devel list, committing th

[Michael Schwendt]

commit beb6c1485e07f84558487a665192e4a9a43b27b7
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Jul 26 12:54:32 2012 +0200

    In response to "[ACTION REQUIRED v4] Retiring packages for F-18" thread on
    devel list, committing the fix as mentioned in private mail:
    
    Fix F18 build by querying pkgconfig for glib2/dbus-glib cflags+libs
    
      (audtty-0.1.12-Makefile.patch).
    - BR dbus-glib-devel (for main.c) instead of just dbus-devel.

 audtty-0.1.12-Makefile.patch |   25 +++++++++++++++++++++++++
 audtty-linking.patch         |   11 -----------
 audtty.spec                  |   15 ++++++++++-----
 3 files changed, 35 insertions(+), 16 deletions(-)
---
diff --git a/audtty-0.1.12-Makefile.patch b/audtty-0.1.12-Makefile.patch
new file mode 100644
index 0000000..3bc63ad
--- /dev/null
+++ b/audtty-0.1.12-Makefile.patch
@@ -0,0 +1,25 @@
+diff -Nurb --strip-trailing-cr audtty-0.1.12-orig/Makefile.in audtty-0.1.12/Makefile.in
+--- audtty-0.1.12-orig/Makefile.in	2010-02-28 19:10:48.000000000 +0100
++++ audtty-0.1.12/Makefile.in	2012-07-26 12:45:36.961860912 +0200
+@@ -10,7 +10,7 @@
+ mandir=@prefix@/share/man/man1
+ sysconfdir=@sysconfdir@
+ 
+-AUDACIOUS_CFLAGS=@AUDACIOUS_CFLAGS@ -I/usr/include/dbus-1.0
++AUDACIOUS_CFLAGS=@AUDACIOUS_CFLAGS@
+ 
+ SOURCES=main.c curses_printf.c playlist.c playlist_jump.c playlist_addurl.c settings.c connect.c browse.c playlist_create.c
+ BINS=$(SOURCES:.c=.o)
+@@ -20,10 +20,10 @@
+ all: audtty
+ 
+ audtty: ${BINS}
+-	cc -g -O2 -g2 -Wall -Werror -lncursesw -laudclient ${LDFLAGS} -o audtty $(BINS)
++	cc -g -O2 -g2 -Wall -Werror -lncursesw -laudclient ${LDFLAGS} `pkg-config --libs glib-2.0 dbus-glib-1` -o audtty $(BINS)
+ 
+ .c.o:
+-	cc -g -Wall ${AUDACIOUS_CFLAGS} ${CFLAGS} -o $@ -c $<
++	cc -g -Wall ${AUDACIOUS_CFLAGS} ${CFLAGS} `pkg-config --cflags glib-2.0 dbus-glib-1` -o $@ -c $<
+ 
+ install: audtty
+ 	mkdir -p ${bindir}
diff --git a/audtty.spec b/audtty.spec
index 35a7bf9..b4c4a29 100644
--- a/audtty.spec
+++ b/audtty.spec
@@ -1,20 +1,20 @@
 Name:           audtty
 Version:        0.1.12
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A ncurses based terminal client for the Audacious
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://audtty.alioth.debian.org/
 Source0:        http://www.code-monkeys.org/audtty/%{name}-%{version}.tar.gz
-Patch0:         %{name}-linking.patch
+Patch0:         audtty-0.1.12-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  glib2-devel
 BuildRequires:  audacious-devel
-BuildRequires:  dbus-devel
+BuildRequires:  dbus-glib-devel
 BuildRequires:  ncurses-devel
 
 Requires:       audacious
@@ -28,14 +28,14 @@ intuitive to learn.
 
 %prep
 %setup -q
-%patch0 -p1 -b .linking
+%patch0 -p1 -b .Makefile-without-pkgconfig
 
 
 %build
 aclocal
 autoconf
 %configure
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 #gzip -cn9 %{name}.1 > %{name}.1.gz && \
 #touch -r %{name}.1 %{name}.1.gz
 
@@ -60,6 +60,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 26 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 0.1.12-7
+- Fix F18 build by querying pkgconfig for glib2/dbus-glib cflags+libs
+  (audtty-0.1.12-Makefile.patch).
+- BR dbus-glib-devel (for main.c) instead of just dbus-devel.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild