[libapogee] curl/types.h removed in latest curl Bug filled upstream Cleanup the specfile

[Sergio Pascual]

commit 338456a44d2025f5d4e75baaa30c39cce370adbf
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Mon Dec 19 13:36:54 2011 +0100

    curl/types.h removed in latest curl
    Bug filled upstream
    Cleanup the specfile

 libapogee.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/libapogee.spec b/libapogee.spec
index 5616c33..c7bb7bf 100644
--- a/libapogee.spec
+++ b/libapogee.spec
@@ -1,6 +1,6 @@
 Name: libapogee
 Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Library for Apogee CCD Cameras
 
 %define majorver 2
@@ -19,6 +19,7 @@ Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # Bug upstream about libapogee calling exit()
 # https://sourceforge.net/tracker2/?func=detail&aid=2595732&group_id=90275&atid=593019
 
+# Since curl 7.21.7, curl/types.h has been removed
 BuildRequires: cmake libusb-devel libcurl-devel
 
 %description
@@ -35,6 +36,10 @@ These are the header files needed to develop a %{name} application
 %setup -q -n %{name}%{majorver}-%{version}
 %patch0 -p1
 %patch1 -p1
+# curl/types.h is deprecated
+# upstream bug https://sourceforge.net/tracker/?func=detail&aid=3462419&group_id=90275&atid=593019
+sed -i '/include.*[<"]curl\/types.h[">]/d' \
+`egrep -rl 'include.*["<]curl/types.h[">]' .`
 
 %build
 %cmake
@@ -44,25 +49,25 @@ make VERBOSE=1 %{?_smp_mflags}
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot}
 
-%clean
-rm -fr %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README LICENSE
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_includedir}/*
 %{_libdir}/*.so
 
 %changelog
+* Mon Dec 19 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-6
+- curl/types.h removed in latest curl
+- Bug filled upstream
+- Cleanup the specfile
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild