rpms/CCfits/devel CCfits-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 CCfits-1.6-removerpath.patch, 1.1, 1.2 CCfits.spec, 1.18, 1.19 sources, 1.8, 1.9 CCfits-includecfitsiopath.patch, 1.3, NONE

[Sergio Pascual]

Author: sergiopr

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

Modified Files:
	.cvsignore CCfits-1.6-removerpath.patch CCfits.spec sources 
Added Files:
	CCfits-pkgconfig.patch 
Removed Files:
	CCfits-includecfitsiopath.patch 
Log Message:
* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
- New upstream version, includes pkgconfig file


CCfits-pkgconfig.patch:
 CCfits.pc.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE CCfits-pkgconfig.patch ---
diff -ur CCfits/CCfits.pc.in CCfits.pkg/CCfits.pc.in
--- CCfits/CCfits.pc.in	2009-09-02 16:34:32.000000000 +0200
+++ CCfits.pkg/CCfits.pc.in	2009-09-10 16:24:41.000000000 +0200
@@ -5,8 +5,8 @@
 
 Name: CCfits
 Description: Object Oriented C++ Interface to CFITSIO Library
-Requires: cfitsio
+Requires.private: cfitsio > 3.08
 Version: 2.2
-Libs: -L${libdir} -lCCfits @LIBS@
+Libs: -L${libdir} -lCCfits
 Cflags: -I${includedir}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	3 Dec 2008 15:01:43 -0000	1.8
+++ .cvsignore	10 Sep 2009 14:30:07 -0000	1.9
@@ -1,2 +1 @@
-CCfits-2.0.tar.gz
-CCfits-2.1.tar.gz
+CCfits-2.2.tar.gz

CCfits-1.6-removerpath.patch:
 Makefile.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: CCfits-1.6-removerpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits-1.6-removerpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- CCfits-1.6-removerpath.patch	11 Dec 2006 17:37:11 -0000	1.1
+++ CCfits-1.6-removerpath.patch	10 Sep 2009 14:30:07 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur CCfits.old/Makefile.in CCfits/Makefile.in
---- CCfits.old/Makefile.in	2006-12-11 18:33:17.000000000 +0100
-+++ CCfits/Makefile.in	2006-12-11 18:32:32.000000000 +0100
-@@ -241,12 +241,12 @@
+diff -ur CCfits/Makefile.in CCfits.rpath/Makefile.in
+--- CCfits/Makefile.in	2009-09-09 17:48:28.000000000 +0200
++++ CCfits.rpath/Makefile.in	2009-09-10 14:28:27.000000000 +0200
+@@ -244,12 +244,12 @@
  # generation like gcc does
  AUTOMAKE_OPTIONS = foreign # no-dependencies
  SUBDIRS = vs.net
@@ -13,14 +13,16 @@ diff -ur CCfits.old/Makefile.in CCfits/M
  cookbook_LDADD = libCCfits.la
 -cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
 +cookbook_LDFLAGS = 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = CCfits.pc
  INCLUDES = -I$(top_srcdir)/..
- lib_LTLIBRARIES = libCCfits.la
- libCCfits_la_SOURCES = \
-@@ -273,7 +273,7 @@
+@@ -277,8 +277,8 @@
+ 
  # This will tell shared library which STD C++ library to use without
  # needing the user to use LD_LIBRARY_PATH environment variable
- libCCfits_la_LIBADD = $(LIBSTDCPP)
+-libCCfits_la_LIBADD = $(LIBSTDCPP)
 -libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
++libCCfits_la_LIBADD = 
 +libCCfits_la_LDFLAGS = 
  libCCfits_ladir = $(pkgincludedir)
  libCCfits_la_HEADERS = \


Index: CCfits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- CCfits.spec	24 Jul 2009 15:01:47 -0000	1.18
+++ CCfits.spec	10 Sep 2009 14:30:08 -0000	1.19
@@ -1,6 +1,6 @@
 Name: CCfits
-Version: 2.1
-Release: 5%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
 Group: Development/Libraries
@@ -8,10 +8,11 @@ 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-includecfitsiopath.patch
+Patch1: CCfits-pkgconfig.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel >= 3.130
+Requires: pkgconfig
 
 %description
 CCfits is an object oriented interface to the cfitsio library. It is designed 
@@ -40,21 +41,18 @@ This package contains the full API docum
 %setup -q -n CCfits
 %patch0 -p1
 %patch1 -p1
-#%{__sed} -e 's|#include "fitsio.h"|#include <cfitsio/fitsio.h>|g' -i CCfits.h FITSBase.h
-#%{__sed} -e 's|#include "longnam.h"|#include <cfitsio/longnam.h>|g' -i CCfits.h FITSBase.h
-# Remove perl files in html docs
-%{__rm} -rf %{_builddir}/%{name}/html/*.pl
+rm -rf %{_builddir}/%{name}/html/*.pl
 
 %build
 %configure --disable-static --with-cfitsio=%{_prefix} --with-cfitsio-include=%{_includedir}/cfitsio
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} %{?_smp_mflags}  install DESTDIR=%{buildroot}
+rm -rf %{buildroot}
+make %{?_smp_mflags}  install DESTDIR=%{buildroot}
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -70,6 +68,7 @@ This package contains the full API docum
 %doc CHANGES 
 %exclude %{_bindir}/cookbook
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 %exclude %{_libdir}/*.la
 %{_includedir}/*
 
@@ -78,6 +77,9 @@ This package contains the full API docum
 %doc html
 
 %changelog
+* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2-1
+- New upstream version, includes pkgconfig file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Dec 2008 15:01:43 -0000	1.8
+++ sources	10 Sep 2009 14:30:08 -0000	1.9
@@ -1,2 +1 @@
-bb049a22f9ff50ef983633dd270f5dbd  CCfits-2.0.tar.gz
-5ce1135efe2bfcbf7b94e10d1d483c71  CCfits-2.1.tar.gz
+68e07adea9ecfb6aba0ac082111053cf  CCfits-2.2.tar.gz


--- CCfits-includecfitsiopath.patch DELETED ---