[gtorrentviewer] Don't include no-longer-existing <curl/types.h>

[Paul Howarth]

commit a962393e4ddc1850fa84668a8f00e60dba428ea3
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Nov 4 10:47:56 2011 +0000

    Don't include no-longer-existing <curl/types.h>
    
    - Don't include no-longer-existing <curl/types.h>
    - Nobody else likes macros for commands

 GTorrentViewer-0.2b-curl-types.patch |   13 +++++++++++++
 gtorrentviewer.spec                  |   24 ++++++++++++++++--------
 2 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/GTorrentViewer-0.2b-curl-types.patch b/GTorrentViewer-0.2b-curl-types.patch
new file mode 100644
index 0000000..c6801b6
--- /dev/null
+++ b/GTorrentViewer-0.2b-curl-types.patch
@@ -0,0 +1,13 @@
+<curl/types.h> went away in curl 7.22.0; everything in it should be
+available through <curl/curl.h> anyway.
+
+--- GTorrentViewer-0.2b/src/main.c
++++ GTorrentViewer-0.2b/src/main.c
+@@ -40,7 +40,6 @@
+ #include <errno.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h> 
+ 
+ #include "bencode.h"
diff --git a/gtorrentviewer.spec b/gtorrentviewer.spec
index b5a35a6..19c9af4 100644
--- a/gtorrentviewer.spec
+++ b/gtorrentviewer.spec
@@ -1,6 +1,6 @@
 Name:		gtorrentviewer
 Version:	0.2b
-Release:	22%{?dist}
+Release:	23%{?dist}
 Summary:	A GTK2-based viewer and editor for BitTorrent meta files
 Group:		Applications/Internet
 License:	GPL+
@@ -10,7 +10,8 @@ Patch0:		gtorrentviewer-0.2b-desktop.patch
 Patch1:		gtorrentviewer-0.2b-dso-linking.patch
 Patch2:		GTorrentViewer-0.2b-tracker-details-refresh.patch
 Patch3:		gtorrentviewer-0.2b-trackerdetails.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch4:		GTorrentViewer-0.2b-curl-types.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	curl-devel, gtk2-devel >= 2.4, desktop-file-utils, gettext, intltool
 
 Requires(post):	  desktop-file-utils
@@ -38,15 +39,18 @@ download.
 # Improve tracker support (#674726)
 %patch3 -p1
 
+# <curl/types.h> went away in curl 7.22.0
+%patch4 -p1
+
 %build
 %configure
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
-%{__rm} -f %{buildroot}%{_datadir}/GTorrentViewer/README
-/usr/bin/desktop-file-install \
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+rm -f %{buildroot}%{_datadir}/GTorrentViewer/README
+desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
 	--delete-original \
@@ -54,7 +58,7 @@ download.
 	%{buildroot}%{_datadir}/applications/gtorrentviewer.desktop
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post
 /usr/bin/update-desktop-database &> /dev/null || :
@@ -73,6 +77,10 @@ download.
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* Fri Nov  4 2011 Paul Howarth <paul at city-fan.org> 0.2b-23
+- Don't include no-longer-existing <curl/types.h>
+- Nobody else likes macros for commands
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2b-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild