rpms/CCfits/devel .cvsignore, 1.4, 1.5 CCfits-1.6-includecfitsiopath.patch, 1.1, 1.2 CCfits.spec, 1.9, 1.10 sources, 1.4, 1.5

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/CCfits/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32392

Modified Files:
	.cvsignore CCfits-1.6-includecfitsiopath.patch CCfits.spec 
	sources 
Log Message:
* Sun Jul 22 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.7-1
- New upstream source 1.7
* Thu Feb 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.6-2
- Patch to fix the include directives of cfitsio in header files.
* Mon Dec 11 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.6-1
- New upstream version 1.6. Only compiles with cfitsio >= 3.020.
* Tue Sep 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.5-3
- Rebuild for FC6.
* Fri Jul 28 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.5-2
- Removed perl files in the documentation (bug #200517).
* Thu Jul 27 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.5-1
- New upstream source 1.5.
- Removed patch CCfits-1.4-g++4.patch (integrated in the source)
- Perl files in docs removed in the source.
* Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-4
- Removed explicit Buildrequires gcc-c++.
* Tue Mar 07 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-3
- Rebuilt with new upstream source.
* Mon Mar 06 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-2
- Removed Source with license file License.txt.
* Mon Feb 20 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-1
- Removed perl files in documentation.
- Changed license type to BSD.
- Main summary changed and trailing dots removed.
- Removed -rpath in the shared library.
* Thu Feb 16 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-0
- Initial spec file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Dec 2006 17:37:11 -0000	1.4
+++ .cvsignore	23 Jul 2007 07:43:42 -0000	1.5
@@ -1 +1 @@
-CCfits-1.6.tar.gz
+CCfits-1.7.tar.gz

CCfits-1.6-includecfitsiopath.patch:

Index: CCfits-1.6-includecfitsiopath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits-1.6-includecfitsiopath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CCfits-1.6-includecfitsiopath.patch	1 Feb 2007 10:55:30 -0000	1.1
+++ CCfits-1.6-includecfitsiopath.patch	23 Jul 2007 07:43:42 -0000	1.2
@@ -1,16 +1,16 @@
 diff -ur CCfits.old/CCfits.h CCfits/CCfits.h
 --- CCfits.old/CCfits.h	2006-11-03 23:07:28.000000000 +0100
 +++ CCfits/CCfits.h	2007-02-01 11:33:56.000000000 +0100
-@@ -13,7 +13,7 @@
- // string
- #include <string>
+@@ -16,7 +16,7 @@
+ #define CCFITS_H 1
+
  // fitsio
 -#include "fitsio.h"
 +#include <cfitsio/fitsio.h>
- 
- namespace CCfits {
-   class ExtHDU;
-@@ -21,7 +21,7 @@
+ // string
+ #include <string>
+
+@@ -26,7 +26,7 @@
  } // namespace CCfits
  #include <map>
  #include <sys/types.h>
@@ -22,12 +22,12 @@
 diff -ur CCfits.old/FITSBase.h CCfits/FITSBase.h
 --- CCfits.old/FITSBase.h	2006-11-03 23:07:28.000000000 +0100
 +++ CCfits/FITSBase.h	2007-02-01 11:34:25.000000000 +0100
-@@ -13,7 +13,7 @@
- // string
- #include <string>
+@@ -18,7 +18,7 @@
+ // CCfitsHeader
+ #include "CCfits.h"
  // fitsio
 -#include "fitsio.h"
 +#include <cfitsio/fitsio.h>
+ // string
+ #include <string>
  // map
- #include <map>
- // CCfitsHeader


Index: CCfits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CCfits.spec	1 Feb 2007 10:55:30 -0000	1.9
+++ CCfits.spec	23 Jul 2007 07:43:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name: CCfits
-Version: 1.6
-Release: 2%{?dist}
+Version: 1.7
+Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
 Group: Development/Libraries
@@ -42,18 +42,18 @@
 %patch0 -p1
 %patch1 -p1
 # 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 -fr %{buildroot}
-make install DESTDIR=%{buildroot}
+%{__rm} -rf %{buildroot}
+%{__make} %{?_smp_mflags}  install DESTDIR=%{buildroot}
 
 %clean
-rm -fr %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -77,6 +77,8 @@
 %doc html
 
 %changelog
+* Sun Jul 22 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.7-1
+- New upstream source 1.7
 * Thu Feb 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.6-2
 - Patch to fix the include directives of cfitsio in header files.
 * Mon Dec 11 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Dec 2006 17:37:11 -0000	1.4
+++ sources	23 Jul 2007 07:43:42 -0000	1.5
@@ -1 +1 @@
-3a5a4369e21a65d819edf82cea5428f6  CCfits-1.6.tar.gz
+f7cbddb94d7dd2dec63968a3c1502052  CCfits-1.7.tar.gz