[libgcal/f14: 2/3] Update spec file, resolve bug #659959

[marionline]

commit 268eb01a699b7a661846da094423e09987cba870
Author: Mario Santagiuliana <mario at marionline.it>
Date:   Thu Jun 16 16:54:01 2011 +0200

    Update spec file, resolve bug #659959

 libgcal--pc_include_fix.diff |   11 --------
 libgcal.spec                 |   55 ++++++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 39 deletions(-)
---
diff --git a/libgcal.spec b/libgcal.spec
index 41c7a5b..c3c1956 100644
--- a/libgcal.spec
+++ b/libgcal.spec
@@ -1,16 +1,13 @@
 Name:		libgcal
 Version:	0.9.6
-Release:	2%{?dist}
+Release:	5%{?dist}
 Summary:	A library to access google calendar events and contacts
 
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://code.google.com/p/libgcal/
 Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
-# The following patch has been provided by Peter Lemenkov on 
-# http://peter.fedorapeople.org/patches/libgcal--pc_include_fix.diff
-Patch0:		libgcal--pc_include_fix.diff
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	libcurl-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	check-devel
@@ -27,37 +24,26 @@ It implements Google Data API 2.0 and is tested on Linux and MacOSX.
 
 
 %package        devel
-Summary:	Development files to use libgcal
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig
+Summary:        Development files to use libgcal
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
-libgcal is a library to access google calendar events and contacts: these are 
+libgcal is a library to access google calendar events and contacts: these are
 the development files that can be used to link against it.
 
 
 %prep
 %setup -q
-%patch0
 
 %build
-%{cmake}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%{cmake} .
 
-#mkdir -p $RPM_BUILD_ROOT/usr/include/libgcal
-#mv $RPM_BUILD_ROOT/usr/include/*.h $RPM_BUILD_ROOT/usr/include/libgcal/
+make %{?_smp_mflags}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%check
-#make check
-#make doxygen
+%install
+rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -65,12 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README Changelog.txt
-%{_libdir}/*.so.*
+%{_libdir}/libgcal.so.0*
 
 %files devel
-%defattr(-,root,root)
 %dir %{_includedir}/libgcal
 %{_includedir}/libgcal/*.h
 %{_libdir}/*.so
@@ -78,9 +62,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/LibGCal
 
 %changelog
+* Thu Jun 16 2011 Mario Santagiuliana <fedora at marionline.it> 0.9.6-5
+- Update spec file following Rex Dieter directive:
+https://bugzilla.redhat.com/show_bug.cgi?id=713741#c5
+
+* Thu Jun 16 2011 Mario Santagiuliana <fedora at marionline.it> 0.9.6-4
+- Update spec file following Rex Dieter directive:
+https://bugzilla.redhat.com/show_bug.cgi?id=713741#c3
+
+* Thu Jun 16 2011 Mario Santagiuliana <mario at marionline.it> 0.9.6-3
+- Update spec file
+- Fix bug #659959
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
+* Wed Nov 24 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.9.6-1
+- update to 0.9.6
+
 * Fri Nov 05 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.9.6-1
 - update to 0.9.6