From 6f72cc76866f3143fc0b46acf5c5fd804548d612 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 9 Mar 2020 09:16:58 -0500 Subject: [PATCH 1/4] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 41ef603f77ece0ce4aeab11bef408f52181a9e0a Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Tue, 10 Mar 2020 12:11:29 +0100 Subject: [PATCH 2/4] New upstream version (7.2) --- .gitignore | 1 + Makefile | 21 ----- sources | 1 + wcslib-perms.patch | 69 ++++++++++++++ wcslib.spec | 231 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 302 insertions(+), 21 deletions(-) create mode 100644 .gitignore delete mode 100644 Makefile create mode 100644 wcslib-perms.patch create mode 100644 wcslib.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f9c66fc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/wcslib-7.2.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 0aeb3e2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wcslib -# $Id$ -NAME := wcslib -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) diff --git a/sources b/sources index e69de29..b3b33cd 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (wcslib-7.2.tar.bz2) = 31b5800de6530d06788c112abe9581b72980177c19414013314e49a4e8913c5943327c1a8539fef8c585d04ffc598d29490c005a2114d66c82a684bd2226c06d diff --git a/wcslib-perms.patch b/wcslib-perms.patch new file mode 100644 index 0000000..9a720b3 --- /dev/null +++ b/wcslib-perms.patch @@ -0,0 +1,69 @@ +diff -ur wcslib-5.16/C/GNUmakefile wcslib-5.16.perms/C/GNUmakefile +--- wcslib-5.16/C/GNUmakefile 2017-01-15 05:25:01.000000000 +0100 ++++ wcslib-5.16.perms/C/GNUmakefile 2017-09-11 12:24:44.434026804 +0200 +@@ -252,7 +252,7 @@ + + install : build + - if [ ! -d "$(LIBDIR)" ] ; then \ +- $(INSTALL) -d -m 2775 $(LIBDIR) ; \ ++ $(INSTALL) -d -m 775 $(LIBDIR) ; \ + fi + $(INSTALL) -m 644 $(WCSLIB) $(LIBDIR) + $(RANLIB) $(LIBDIR)/$(WCSLIB) +@@ -274,7 +274,7 @@ + fi ; \ + fi + - if [ ! -d "$(INCDIR)" ] ; then \ +- $(INSTALL) -d -m 2775 $(INCDIR) ; \ ++ $(INSTALL) -d -m 775 $(INCDIR) ; \ + fi + $(INSTALL) -m 444 *.h $(INCDIR) + $(RM) $(INCLINK) +diff -ur wcslib-5.16/GNUmakefile wcslib-5.16.perms/GNUmakefile +--- wcslib-5.16/GNUmakefile 2017-01-15 05:25:03.000000000 +0100 ++++ wcslib-5.16.perms/GNUmakefile 2017-09-11 12:25:23.739580571 +0200 +@@ -82,7 +82,7 @@ + done + $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR) + - if [ ! -d "$(DOCDIR)" ] ; then \ +- $(INSTALL) -d -m 2775 $(DOCDIR) ; \ ++ $(INSTALL) -d -m 775 $(DOCDIR) ; \ + fi + $(INSTALL) -m 444 CHANGES COPYING* README $(DOCDIR) + - if [ -h $(DOCLINK) ] ; then \ +@@ -90,15 +90,15 @@ + $(LN_S) $(notdir $(DOCDIR)) $(DOCLINK) ; \ + fi + - if [ ! -d "$(PDFDIR)" ] ; then \ +- $(INSTALL) -d -m 2775 $(PDFDIR) ; \ ++ $(INSTALL) -d -m 775 $(PDFDIR) ; \ + fi + $(INSTALL) -m 444 wcslib.pdf $(PDFDIR) + - if [ ! -d "$(HTMLDIR)/html" ] ; then \ +- $(INSTALL) -d -m 2775 $(HTMLDIR)/html ; \ ++ $(INSTALL) -d -m 775 $(HTMLDIR)/html ; \ + fi + $(INSTALL) -m 444 html/* $(HTMLDIR)/html + if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \ +- $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \ ++ $(INSTALL) -d -m 775 $(LIBDIR)/pkgconfig ; \ + fi + $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc + +diff -ur wcslib-5.16/utils/GNUmakefile wcslib-5.16.perms/utils/GNUmakefile +--- wcslib-5.16/utils/GNUmakefile 2017-01-15 05:25:04.000000000 +0100 ++++ wcslib-5.16.perms/utils/GNUmakefile 2017-09-11 12:23:25.705917622 +0200 +@@ -108,11 +108,11 @@ + + install : build + - if [ ! -d "$(BINDIR)" ] ; then \ +- $(INSTALL) -d -m 2775 $(BINDIR) ; \ ++ $(INSTALL) -d -m 775 $(BINDIR) ; \ + fi + $(INSTALL) -m 755 $(UTILS) $(BINDIR) + - if [ ! -d "$(MANDIR)" ] ; then \ +- $(INSTALL) -d -m 2775 $(MANDIR)/man1 ; \ ++ $(INSTALL) -d -m 775 $(MANDIR)/man1 ; \ + fi + $(INSTALL) -m 644 $(MAN) $(MANDIR)/man1 + diff --git a/wcslib.spec b/wcslib.spec new file mode 100644 index 0000000..3acd869 --- /dev/null +++ b/wcslib.spec @@ -0,0 +1,231 @@ + +Name: wcslib +Version: 7.2 +Release: 1%{?dist} +Summary: An implementation of the FITS World Coordinate System standard + +# Library is under LGPLv3+ utils under GPLv3+ +License: LGPLv3+ +URL: http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/ +Source0: ftp://ftp.atnf.csiro.au/pub/software/wcslib/%{name}-%{version}.tar.bz2 + +# General stuff +BuildRequires: flex +BuildRequires: gcc +# Development libraries +BuildRequires: cfitsio-devel +BuildRequires: zlib-devel + +%description +WCSLIB is a library that implements the "World Coordinate System" (WCS) +convention in FITS (Flexible Image Transport System) + +%package devel +Summary: Libraries, includes, etc. used to develop an application with %{name} +License: LGPLv3+ +Requires: wcslib = %{version}-%{release} +%description devel +These are the files needed to develop an application using %{name}. + +%package utils +Summary: Utility programs provided by %{name} +License: GPLv3+ +Requires: wcslib = %{version}-%{release} +%description utils +Utils provided with %{name} + +%prep +%setup -q + +%build +%configure --disable-fortran --disable-static +# Does not like multithread builds... +make + +%install +make install DESTDIR=%{buildroot} +# fix permissions +rm -rf %{buildroot}/usr/share/doc/wcslib* +chmod 755 %{buildroot}%{_includedir}/wcslib-%{version} + +%check +make check + +%ldconfig_scriptlets + +%files +%license COPYING.LESSER +%doc README +%{_libdir}/*.so.* + +%files devel +%license COPYING.LESSER +%doc html wcslib.pdf +%{_libdir}/*.so +%exclude %{_libdir}/*.a +%{_libdir}/pkgconfig/wcslib.pc +%{_includedir}/wcslib +%{_includedir}/wcslib-%{version} + +%files utils +%license COPYING +%{_bindir}/* +%{_mandir}/man1/* + +%changelog +* Mon Mar 09 2020 Sergio Pascual 7.2-1 +- New upstream version (7.2) + +* Fri Jan 31 2020 Fedora Release Engineering - 6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Aug 31 2019 Sergio Pascual 6.4-1 +- New upstream version (6.4) + +* Mon Jul 29 2019 Sergio Pascual 6.3-1 +- New upstream version (6.3) + +* Sat Jul 27 2019 Fedora Release Engineering - 5.19.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 5.19.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Aug 02 2018 Christian Dersch - 5.19.1-1 +- new version + +* Sat Jul 14 2018 Fedora Release Engineering - 5.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat May 26 2018 Christian Dersch - 5.18-3 +- added BR: flex + +* Sat May 26 2018 Christian Dersch - 5.18-2 +- rebuilt for cfitsio 3.450 + +* Fri Feb 23 2018 Christian Dersch - 5.18-1 +- new version + +* Fri Feb 09 2018 Fedora Release Engineering - 5.16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 11 2017 Sergio Pascual 5.16-7 +- Patch all problematic 2775 install permissions to 775 + +* Thu Aug 03 2017 Fedora Release Engineering - 5.16-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 5.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 01 2017 Christian Dersch - 5.16-4 +- try workaround for #1452893 + +* Thu Jun 01 2017 Christian Dersch - 5.16-3 +- yet another rebuild for build-id conflicts + +* Fri May 19 2017 Christian Dersch - 5.16-2 +- rebuild, to fix #1452893 + +* Tue May 16 2017 Sergio Pascual 5.16-1 +- New upstream source (5.16) + +* Sat Feb 11 2017 Fedora Release Engineering - 5.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jul 15 2016 Sergio Pascual 5.15-1 +- New upstream source (5.15) + +* Wed Mar 30 2016 Sergio Pascual 5.14-1 +- New upstream source (5.14), soname bump + +* Fri Feb 05 2016 Fedora Release Engineering - 4.25.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 4.25.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Jan 26 2015 Sergio Pascual 4.25.1-1 +- New upstream source (4.25.1) + +* Mon Aug 18 2014 Fedora Release Engineering - 4.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 4.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 19 2014 Sergio Pascual 4.23-1 +- New upstream source (4.23) + +* Sun Apr 13 2014 Sergio Pascual 4.22-1 +- New upstream source (4.22) + +* Thu Jan 09 2014 Sergio Pascual 4.20-1 +- New upstream source (4.20) +- Rebuilt for new cfitsio (3.360) + +* Wed Oct 23 2013 Sergio Pascual 4.19-1 +- New upstream source (4.19) + +* Sat Aug 24 2013 Sergio Pascual 4.18-3 +- Removed reference to versioned docdir (bz #993888) + +* Sun Aug 04 2013 Fedora Release Engineering - 4.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 16 2013 Sergio Pascual 4.18-1 +- New upstream source (4.18) + +* Fri Mar 22 2013 Sergio Pascual 4.17-2 +- Rebuilt for new cfitsio (3.340) + +* Wed Mar 20 2013 Sergio Pascual 4.17-1 +- New upstream source + +* Fri Feb 15 2013 Fedora Release Engineering - 4.13.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 4.13.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 27 2012 Sergio Pascual 4.13.4-1 +- New upstream source + +* Sat Jan 07 2012 Sergio Pascual 4.8.4-3 +- Disable check + +* Fri Jan 06 2012 Sergio Pascual 4.8.4-2 +- New upstream source (source added) + +* Fri Jan 06 2012 Sergio Pascual 4.8.4-1 +- New upstream source + +* Mon Feb 21 2011 Sergio Pascual 4.7-2 +- EVR bump for rebuilding + +* Sun Feb 20 2011 Sergio Pascual 4.7-1 +- New upstream source + +* Mon Feb 07 2011 Fedora Release Engineering - 4.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 09 2010 Sergio Pascual 4.6.3-2 +- Race condition with parallel make + +* Tue Nov 09 2010 Sergio Pascual 4.6.3-1 +- New upstream source +- Patch to fix problems compiling i686 in x86_64 + +* Tue Nov 09 2010 Sergio Pascual 4.5.6-1 +- New upstream source +- Added pkgconfig file + +* Mon Jul 27 2009 Fedora Release Engineering - 4.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Mar 16 2009 Sergio Pascual 4.3.1-2 +- Added patch to link explicitly with libmath. +- Removed duplicate licenses. + +* Sat Feb 14 2009 Sergio Pascual 4.3.1-1 +- First version. From d6d67c9b7c3b6fda7fea948f0896de8049501091 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:50:20 +0000 Subject: [PATCH 3/4] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 4ce839635be0138d17dd4f7154bfe96ab7121487 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Wed, 1 Nov 2023 18:03:13 +0100 Subject: [PATCH 4/4] New upstream version (7.12) --- .gitignore | 1 + sources | 2 +- wcslib.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f9c66fc..38ebeee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /wcslib-7.2.tar.bz2 +/wcslib-7.12.tar.bz2 diff --git a/sources b/sources index b3b33cd..34cdcfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wcslib-7.2.tar.bz2) = 31b5800de6530d06788c112abe9581b72980177c19414013314e49a4e8913c5943327c1a8539fef8c585d04ffc598d29490c005a2114d66c82a684bd2226c06d +SHA512 (wcslib-7.12.tar.bz2) = 7f38f725992d3c4bd3c1b908d494ac361c17f6b60f091d987fda596211423bb7396b3a5e2f1f6dd6215835016d302083472a7ad0822f17cdfe230c8f556b3e23 diff --git a/wcslib.spec b/wcslib.spec index 3acd869..a06ac43 100644 --- a/wcslib.spec +++ b/wcslib.spec @@ -1,15 +1,16 @@ Name: wcslib -Version: 7.2 +Version: 7.12 Release: 1%{?dist} Summary: An implementation of the FITS World Coordinate System standard # Library is under LGPLv3+ utils under GPLv3+ License: LGPLv3+ URL: http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/ -Source0: ftp://ftp.atnf.csiro.au/pub/software/wcslib/%{name}-%{version}.tar.bz2 +Source0: http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-%{version}.tar.bz2 # General stuff +BuildRequires: make BuildRequires: flex BuildRequires: gcc # Development libraries @@ -45,7 +46,7 @@ make %install make install DESTDIR=%{buildroot} # fix permissions -rm -rf %{buildroot}/usr/share/doc/wcslib* +rm -rf %{buildroot}%{_datadir}/doc/wcslib* chmod 755 %{buildroot}%{_includedir}/wcslib-%{version} %check @@ -73,6 +74,9 @@ make check %{_mandir}/man1/* %changelog +* Wed Dec 28 2022 Sergio Pascual 7.12-1 +- New upstream version (7.12) + * Mon Mar 09 2020 Sergio Pascual 7.2-1 - New upstream version (7.2)