rpms/CCfits/devel CCfits.spec,1.19,1.20

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/CCfits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2552

Modified Files:
	CCfits.spec 
Log Message:
* Wed Jan 27 2010 Sergio Pascual <sergiopr at fedoraproject.org> 2.2-2
- Rebuilt to match new cfitsio 3.240
- Removed require pkgconfig
- Using upstream pkgconfig file
- Minor fixes



Index: CCfits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- CCfits.spec	10 Sep 2009 14:30:08 -0000	1.19
+++ CCfits.spec	27 Jan 2010 23:43:51 -0000	1.20
@@ -1,6 +1,6 @@
 Name: CCfits
 Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A C++ interface for cfitsio
 
 Group: Development/Libraries
@@ -8,11 +8,9 @@ License: BSD
 URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits
 Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz
 Patch0: CCfits-1.6-removerpath.patch
-Patch1: CCfits-pkgconfig.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: cfitsio-devel >= 3.130
-Requires: pkgconfig
+BuildRequires: cfitsio-devel
 
 %description
 CCfits is an object oriented interface to the cfitsio library. It is designed 
@@ -23,7 +21,7 @@ with namespaces, exception handling, and
 %package devel
 Summary: Headers for developing programs that will use %{name}
 Group: Development/Libraries
-Requires: cfitsio-devel
+Requires: cfitsio-devel >= 3.240
 Requires: %{name} = %{version}-%{release}
 %description devel
 These are the header files and libraries needed to develop a %{name} 
@@ -40,7 +38,6 @@ This package contains the full API docum
 %prep
 %setup -q -n CCfits
 %patch0 -p1
-%patch1 -p1
 rm -rf %{_builddir}/%{name}/html/*.pl
 
 %build
@@ -59,12 +56,12 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc License.txt
 %{_libdir}/*so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGES 
 %exclude %{_bindir}/cookbook
 %{_libdir}/*.so
@@ -77,6 +74,12 @@ rm -rf %{buildroot}
 %doc html
 
 %changelog
+* Wed Jan 27 2010 Sergio Pascual <sergiopr at fedoraproject.org> 2.2-2
+- Rebuilt to match new cfitsio 3.240
+- Removed require pkgconfig
+- Using upstream pkgconfig file
+- Minor fixes
+
 * Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
 - New upstream version, includes pkgconfig file