[swarp/el6/master] Pull from master

[Lubomir Rintel]

commit 3aaad93aab487066a1f8dc1941e5288c737b745a
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Aug 3 21:27:22 2010 +0200

    Pull from master

 .gitignore         |    1 +
 sources            |    2 +-
 swarp-cflags.patch |   29 +++++++++++++++++++++++++++++
 swarp.spec         |   41 ++++++++++++++++++++++++++++++-----------
 4 files changed, 61 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc46544..d1cfbcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 swarp-2.17.1.tar.gz
+swarp-2.17.6.tar.gz
diff --git a/sources b/sources
index 7c0349a..e3a100c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21c420527954c94dbc21c5f00bce6e6b  swarp-2.17.1.tar.gz
+ad8e99461fac011bef963eb1461886c6  swarp-2.17.6.tar.gz
diff --git a/swarp-cflags.patch b/swarp-cflags.patch
new file mode 100644
index 0000000..bc4e0f2
--- /dev/null
+++ b/swarp-cflags.patch
@@ -0,0 +1,29 @@
+diff -ur swarp-2.17.6/configure swarp.new/configure
+--- swarp-2.17.6/configure	2009-04-09 15:54:10.000000000 +0200
++++ swarp.new/configure	2010-03-30 23:04:21.000000000 +0200
+@@ -2278,10 +2278,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
+@@ -4144,8 +4144,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=""
diff --git a/swarp.spec b/swarp.spec
index 9af4d33..4260a78 100644
--- a/swarp.spec
+++ b/swarp.spec
@@ -1,44 +1,63 @@
 Name: swarp
-Version: 2.17.1
-Release: 5%{?dist}
+Version: 2.17.6
+Release: 2%{?dist}
 Summary: Tool that resamples and co-adds together FITS images
 
 Group: Applications/Engineering
-License: GPLv2
-URL: http://terapix.iap.fr/soft/%{name}
+License: CeCILL
+URL: http://www.astromatic.net/software/%{name}
 Source0: ftp://ftp.iap.fr/pub/from_users/bertin/%{name}/%{name}-%{version}.tar.gz
+Patch0: swarp-cflags.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 SWarp is a program that resamples and co-adds together FITS images 
 using any arbitrary astrometric projection defined in the WCS standard. 
 
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+BuildArch: noarch
+
+%description doc
+This package contains the documentation for %{name}.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-threads
-
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -fr %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS HISTORY README THANKS TODO doc/swarp.pdf 
+%doc AUTHORS BUGS COPYRIGHT HISTORY README THANKS TODO
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/manx/*
 %{_datadir}/%{name}/
 
-
+%files doc
+%defattr(-,root,root,-)
+%doc COPYRIGHT doc/swarp.pdf 
 
 %changelog
+* Fri Jul 09 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.17.6-2
+- License in -doc subpackage
+
+* Tue Mar 30 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.17.6-1
+- New version from astromatic.iap.fr. 
+- License is Cecill know
+- Documentation in -doc subpackage
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild