Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Sergio Pascual
2eec3d1861 Removing unused patch
Removed clean section
2011-08-24 16:11:38 +02:00
Sergio Pascual
5709a66e59 New upstream source 2011-02-21 23:13:32 +01:00
Sergio Pascual
ad3877f5d9 Merge branch 'master', remote-tracking branch 'origin' into f15 2011-02-21 23:12:29 +01:00
2 changed files with 4 additions and 54 deletions

View file

@ -1,48 +0,0 @@
diff -ur wcslib-4.6.3/configure wcslib-4.6.3.new/configure
--- wcslib-4.6.3/configure 2010-11-24 02:35:31.000000000 +0100
+++ wcslib-4.6.3.new/configure 2010-12-13 11:31:39.519768352 +0100
@@ -9648,7 +9648,7 @@
*)
# Covers Linux and Solaris at least.
SHRLIB="libwcs.so.$V"
- SHRLD="$SHRLD -shared -Wl,-h\$(SHRLIB)"
+ SHRLD="$SHRLD $CFLAGS -shared -Wl,-h\$(SHRLIB)"
SHRLN="libwcs.so"
;;
esac
diff -ur wcslib-4.6.3/utils/GNUmakefile wcslib-4.6.3.new/utils/GNUmakefile
--- wcslib-4.6.3/utils/GNUmakefile 2010-11-16 07:16:20.000000000 +0100
+++ wcslib-4.6.3.new/utils/GNUmakefile 2010-12-13 11:44:09.276785040 +0100
@@ -59,20 +59,20 @@
fitshdr : fitshdr.c
-@ echo ''
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.o $<
- $(LD) -o $@ $@.o $(LDFLAGS) $(LIBS)
+ $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(LIBS)
-@ $(RM) $@.o
HPXcvt : HPXcvt.c
-@ echo ''
$(CC) $(CPPFLAGS) $(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
- $(LD) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
+ $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
-@ $(RM) $@.o
wcsware : wcsware.c $(GETWCSTAB) $(LIBWCS)
-@ echo ''
$(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(CFITSIOINC) \
$(CFLAGS) -c -o $@.o $<
- $(LD) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \
+ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \
$(FLIBS) $(LIBS)
-@ $(RM) $@.o
@@ -80,7 +80,7 @@
-@ echo ''
$(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(PGPLOTINC) \
$(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
- $(LD) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \
+ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \
$(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(FLIBS) $(LIBS)
-@ $(RM) $@.o

View file

@ -54,9 +54,6 @@ install -m 755 C/libwcs.so.%{version} %{buildroot}/%{_libdir}
ln -s libwcs.so.%{version} %{buildroot}/%{_libdir}/libwcs.so.4
ln -s libwcs.so.%{version} %{buildroot}/%{_libdir}/libwcs.so
%clean
rm -rf %{buildroot}
%check
make check
@ -81,10 +78,11 @@ make check
%{_bindir}/*
%changelog
* Mon Feb 21 2011 Sergio Pascual <sergiopr at fedoraproject.org> 4.7-2
- EVR bump for rebuilding
* Wed Aug 24 2011 Sergio Pascual <sergiopr at fedoraproject.org> 4.7-2
- Removing unused patch
- Removed clean section
* Sun Feb 20 2011 Sergio Pascual <sergiopr at fedoraproject.org> 4.7-1
* Mon Feb 21 2011 Sergio Pascual <sergiopr at fedoraproject.org> 4.7-1
- New upstream source
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.3-3