Rebuild as needed for 1.8.1-3 and latest Audacious library deps.

Fix rebuild failure on Rawhide (no <curl/types.h>).
This commit is contained in:
Michael Schwendt 2011-12-24 11:22:24 +01:00
parent 597fca1b11
commit 1a6c97e169
2 changed files with 19 additions and 1 deletions

11
conky-1.8.1-libcurl.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Nur conky-1.8.1-orig/src/ccurl_thread.c conky-1.8.1/src/ccurl_thread.c
--- conky-1.8.1-orig/src/ccurl_thread.c 2010-10-05 23:29:36.000000000 +0200
+++ conky-1.8.1/src/ccurl_thread.c 2011-12-24 11:16:13.455464858 +0100
@@ -33,7 +33,6 @@
#endif /* DEBUG */
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
/*

View File

@ -15,7 +15,7 @@
Name: conky
Version: 1.8.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: A system monitor for X
Group: User Interface/X
@ -24,6 +24,8 @@ URL: http://conky.sf.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: conky-1.8.1-libcurl.patch
BuildRequires: libXft-devel
BuildRequires: libXt-devel
BuildRequires: libXdamage-devel
@ -46,6 +48,7 @@ It just keeps on given'er. Yeah.
%prep
%setup -q
%patch0 -p1 -b .libcurl-no-types-header
for i in AUTHORS; do
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@ -100,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Dec 24 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 1.8.1-4
- Rebuild as needed for 1.8.1-3 and latest Audacious library deps.
- Fix rebuild failure on Rawhide (no <curl/types.h>).
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.8.1-3
- Rebuild for new libpng