Compare commits

...

No commits in common. 'i10ce' and 'epel9' have entirely different histories.
i10ce ... epel9

@ -1 +0,0 @@
c308310db7541b5c43e5a3d06f1255344b505a2c SOURCES/cfitsio-4.4.0.tar.gz

19
.gitignore vendored

@ -1 +1,18 @@
SOURCES/cfitsio-4.4.0.tar.gz
cfitsio3250.tar.gz
/cfitsio3270.tar.gz
/cfitsio3280.tar.gz
/cfitsio3290.tar.gz
/beta_cfitsio3300.tar.gz
/cfitsio3310.tar.gz
/cfitsio3330.tar.gz
/cfitsio3340.tar.gz
/cfitsio3350.tar.gz
/cfitsio3360.tar.gz
/cfitsio3370.tar.gz
/cfitsio3420.tar.gz
/cfitsio3430.tar.gz
/cfitsio3450.tar.gz
/cfitsio-3.47.tar.gz
/cfitsio-3.49.tar.gz
/cfitsio-4.0.0.tar.gz
/cfitsio-4.1.0.tar.gz

@ -1,12 +0,0 @@
diff -Naur cfitsio-4.2.0/configure cfitsio-4.2.0.ldflags/configure
--- cfitsio-4.2.0/configure 2022-10-31 19:40:23.000000000 +0100
+++ cfitsio-4.2.0.ldflags/configure 2022-11-25 10:05:55.387220762 +0100
@@ -4670,7 +4670,7 @@
#-------------------------------------------------------------------------------
-LDFLAGS="$CFLAGS"
+# LDFLAGS="$CFLAGS"
LDFLAGS_BIN="$LDFLAGS"
if test "x$FC" = "xnone" ; then

@ -0,0 +1,14 @@
diff -up cfitsio-4.1.0/configure.ldflags cfitsio-4.1.0/configure
--- cfitsio-4.1.0/configure.ldflags 2022-08-23 21:19:59.893242099 -0600
+++ cfitsio-4.1.0/configure 2022-08-23 21:20:12.986361691 -0600
@@ -4644,8 +4644,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-LDFLAGS="$CFLAGS"
-LDFLAGS_BIN="$LDFLAGS"
+# LDFLAGS="$CFLAGS"
+LDFLAGS_BIN="$CFLAGS"
if test "x$FC" = "xnone" ; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5

@ -1,7 +1,7 @@
diff -ur cfitsio-4.2.0/configure cfitsio-4.2.0.rpath/configure
--- cfitsio-4.2.0/configure 2022-11-25 10:08:23.942637069 +0100
+++ cfitsio-4.2.0.rpath/configure 2022-11-25 10:10:13.213414398 +0100
@@ -5062,7 +5062,7 @@
diff -up cfitsio-4.1.0/configure.rpath cfitsio-4.1.0/configure
--- cfitsio-4.1.0/configure.rpath 2022-08-23 21:21:35.166112312 -0600
+++ cfitsio-4.1.0/configure 2022-08-23 21:35:59.586014956 -0600
@@ -5036,7 +5036,7 @@ case $host in
printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
# LDFLAGS used by utilities:

@ -0,0 +1,60 @@
diff -ur cfitsio-3.47/Makefile.in cfitsio-3.47.zlib/Makefile.in
--- cfitsio-3.47/Makefile.in 2019-05-08 17:34:50.000000000 +0200
+++ cfitsio-3.47.zlib/Makefile.in 2019-08-01 15:52:57.829760351 +0200
@@ -68,9 +68,7 @@
pliocomp.c fits_hcompress.c fits_hdecompress.c \
simplerng.c @GSIFTP_SRC@
-ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
- zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
@@ -103,7 +101,7 @@
shared: lib${PACKAGE}${SHLIB_SUFFIX}
lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
@@ -140,28 +138,28 @@
${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
smem: smem.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
speed: speed.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
eval: # Rebuild eval_* files from flex/bison source
${FLEX} -t eval.l > eval_l.c1

@ -1,19 +1,9 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 2;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
Name: cfitsio
Version: 4.4.0
Release: %autorelease
Version: 4.1.0
Release: 1%{?dist}
Summary: Library for manipulating FITS data files
License: CFITSIO
License: MIT
URL: http://heasarc.gsfc.nasa.gov/fitsio/
Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-%{version}.tar.gz
# Remove soname version check
@ -85,7 +75,11 @@ compression algorithm.
amount of compression
%prep
%autosetup -p1
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1 -b .ldflags
%patch4 -p1 -b .rpath
%build
%configure --enable-reentrant -with-bzip2
@ -99,9 +93,13 @@ cmp -s testprog.lis testprog.out
cmp -s testprog.fit testprog.std
%install
%make_install LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_includedir}/%{name}
make LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
CFITSIO_LIB=%{buildroot}%{_libdir} \
CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name}
CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} \
install
cp -p f{,un}pack %{buildroot}%{_bindir}
chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
@ -111,48 +109,28 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
%ldconfig_scriptlets
%files
%doc README.md docs/changes.txt
%license licenses/NASA_Open_Source_Agreement_1.3.txt
%{_libdir}/libcfitsio.so.10*
%doc README License.txt docs/changes.txt
%{_libdir}/libcfitsio.so.9*
%files devel
%doc utilities/cookbook.*
%doc cookbook.*
%{_includedir}/%{name}
%{_libdir}/libcfitsio.so
%{_libdir}/pkgconfig/cfitsio.pc
%files static
%license licenses/NASA_Open_Source_Agreement_1.3.txt
%doc License.txt
%{_libdir}/libcfitsio.a
%files docs
%doc docs/fitsio.pdf docs/cfitsio.pdf
%license licenses/NASA_Open_Source_Agreement_1.3.txt
%doc docs/fitsio.doc docs/fitsio.pdf docs/cfitsio.pdf License.txt
%files -n fpack
%doc docs/fpackguide.pdf
%license licenses/NASA_Open_Source_Agreement_1.3.txt
%doc docs/fpackguide.pdf License.txt
%{_bindir}/fpack
%{_bindir}/funpack
%changelog
* Tue Dec 24 2024 Dmitriy Samoylik <samoylikdv@msvsphere-os.ru> - 4.4.0-2
- Rebuilt for MSVSphere 10
## START: Generated by rpmautospec
* Tue Jul 11 2023 Sergio Pascual <sergiopr@fedoraproject.org> - 4.2.0-4
- Use SPDX License
- License name is CFITSIO
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jan 05 2023 Kalev Lember <klember@redhat.com> - 4.2.0-2
- Use make_install macro
* Fri Nov 25 2022 Sergio Pascual <sergiopr@fedoraproject.org> - 4.2.0-1
- New upstream version 4.2.0
* Wed Aug 24 2022 Orion Poplawski <orion@nwra.com> - 4.1.0-1
- Update to 4.1.0
@ -356,7 +334,7 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
- Update to upstream 3.240 release.
* Mon Nov 2 2009 Matthew Truch <matt at truch.net> - 3.210-2
- Re-introduce library soname patch (accidentally removed it).
- Re-introduce library soname patch (accidentally removed it).
* Tue Oct 20 2009 Matthew Truch <matt at truch.net> - 3.210-1
- Update to upstream 3.210 release.
@ -370,14 +348,14 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
* Wed Jun 17 2009 Matthew Truch <matt at truch.net> - 3.130-5
- Separate -docs noarch subpackage as per BZ 492438.
- Explicitly set file attributes correctly.
- Explicitly set file attributes correctly.
* Tue Mar 10 2009 Matthew Truch <matt at truch.net> - 3.130-4
- Set correct version in pkgconfig .pc file.
- Set correct version in pkgconfig .pc file.
* Sun Feb 22 2009 Matthew Truch <matt at truch.net> - 3.130-3
- Re-check testprogram output.
- Build for koji, rpm, gcc upgrade.
- Build for koji, rpm, gcc upgrade.
* Thu Feb 5 2009 Matthew Truch <matt at truch.net> - 3.130-2
- Fix source file naming typo.
@ -386,7 +364,7 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
- Update to 3.130 upstream.
* Sat Sep 20 2008 Matthew Truch <matt at truch.net> - 3.100-2
- Test library with included test-suite.
- Test library with included test-suite.
* Fri Sep 19 2008 Matthew Truch <matt at truch.net> - 3.100-1
- Update to 3.100 upstream.
@ -415,8 +393,8 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
* Fri Feb 16 2007 Matthew Truch <matt at truch.net> - 3.030-2
- Require pkgconfig for -devel.
- export CC=gcc so we don't clobber $RPM_OPT_FLAGS, thereby
ruining any -debuginfo packages.
- export CC=gcc so we don't clobber $RPM_OPT_FLAGS, thereby
ruining any -debuginfo packages.
See RedHat Bugzilla 229041.
* Fri Jan 5 2007 Matthew Truch <matt at truch.net> - 3.030-1
@ -439,9 +417,9 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
- Include defattr() for devel package as well - bug 187366
* Sun Mar 19 2006 Matthew Truch <matt at truch.net> - 3.006-4
- Don't use macro {buildroot} in build, only in install as per
- Don't use macro {buildroot} in build, only in install as per
appended comments to Bugzilla bug 172042
* Fri Mar 10 2006 Matthew Truch <matt at truch.net> - 3.006-3
- Point to f95 instead of g95 as per bugzilla bug 185107
@ -500,4 +478,3 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
* Sat Oct 29 2005 Matthew Truch <matt at truch.net> - 3.004-0.1.b
- Initial spec file for Fedora Extras.
## END: Generated by rpmautospec

@ -0,0 +1 @@
SHA512 (cfitsio-4.1.0.tar.gz) = bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813
Loading…
Cancel
Save