dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: sextractor
-# $Id$
-NAME := sextractor
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sextractor-cflags.patch

@@ -0,0 +1,29 @@
+diff -ur sextractor-2.8.6/configure sextractor-2.8.6.new/configure
+--- sextractor-2.8.6/configure	2009-04-09 15:30:14.000000000 +0200
++++ sextractor-2.8.6.new/configure	2009-08-26 16:39:05.000000000 +0200
+@@ -2487,10 +2487,10 @@
+ cclist="cc gcc"
+ 
+ # Backup and reset the input CFLAGS and LDFLAGS
+-mycflags="$CFLAGS"
+-CFLAGS=""
+-myldflags="$LDFLAGS"
+-LDFLAGS=""
++#mycflags="$CFLAGS"
++#CFLAGS=""
++#myldflags="$LDFLAGS"
++#LDFLAGS=""
+ 
+ # Provide special option for the Linux Intel C compiler
+ { echo "$as_me:$LINENO: checking for Linux Intel C compiler mode" >&5
+@@ -4358,8 +4358,8 @@
+       rm -f conftest.*
+     fi
+     if test -n "$prog_cc_optim_flags"; then
+-      CFLAGS="$CFLAGS $prog_cc_optim_flags"
+-      LDFLAGS="$LDFLAGS $prog_ld_optim_flags"
++      prog_cc_optim_flags=""
++      prog_ld_optim_flags=""
+     else
+       prog_cc_optim_flags=""
+       prog_ld_optim_flags=""

sextractor.spec

@@ -1,14 +1,16 @@
 Name: sextractor
-Version: 2.5.0
-Release: 9%{?dist}
+Version: 2.8.6
+Release: 1%{?dist}
 Summary: Extract catalogs of sources from astronomical images
 
 Group: Applications/Engineering
-License: GPLv2
-URL: http://terapix.iap.fr/soft/%{name}
+License: CeCILL
+URL: http://astromatic.iap.fr/software/%{name}
 Source0: ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/%{name}-%{version}.tar.gz
-Patch0: sextractor-pointer-alias.patch
+Patch0: sextractor-cflags.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: fftw-devel >= 3.1
+BuildRequires: atlas-devel >= 3.6.0
 
 %description
 SExtractor is a program that builds a catalogue of objects from an 
@@ -22,29 +24,30 @@ well on moderately crowded star fields.
 
 %build
 %configure
-
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{_datadir}/%{name}
-%{__install} -m 644 -p config/*.conv %{buildroot}%{_datadir}/%{name}
-%{__install} -m 644 -p config/default.nnw %{buildroot}%{_datadir}/%{name}
-
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_datadir}/%{name}
+install -m 644 -p config/*.conv %{buildroot}%{_datadir}/%{name}
+install -m 644 -p config/default.nnw %{buildroot}%{_datadir}/%{name}
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING HISTORY README THANKS doc/README.DOC doc/sextractor.pdf config/default.sex config/default.param
+%doc AUTHORS BUGS COPYRIGHT HISTORY README THANKS doc/README.DOC doc/sextractor.pdf config/default.sex config/default.param
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/manx/*
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Jul 12 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.8.6-1
+- New upstream source
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -59,21 +62,28 @@ well on moderately crowded star fields.
 
 * Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-5.1
 - Rebuild for Fedora 8 to get the build-id
+
 * Tue Sep 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-5
 - Rebuilt for FC6.
+
 * Wed Jul 26 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-4
 - Patch to resolve pointer aliasing problems (bug #199700)
 - Removed -DXSL_URL flag, as the file sextractor.xsl does not exist yet
+
 * Mon Jul 24 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-3
 - Reverting optimization to -O2, it breaks debug infos
+
 * Fri Jul 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-2
 - fitsconv.c has correct permissions
 - changed optimization from -O2 to -O1 (bug #199700)
 - additional define allows VOTable output
+
 * Wed Jul 19 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.5.0-1
 - New upstream version 2.5.0
+
 * Tue Jun 20 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.4.4-2
 - Fixed executable permission in src/fits/fitsconv.c
 - default.sex and default.param moved to docs
+
 * Mon Jun 19 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.4.4-1
 - Initial spec file.

sources

@@ -1 +1 @@
-3dede44685b582ad5ee03f5b69423530  sextractor-2.5.0.tar.gz
+6c2fc529cd89bdd11b1fbafc0866131c  sextractor-2.8.6.tar.gz