From f747f10e7c2b116243fa0f09b4d6837c13fea25d Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 14 Apr 2022 12:25:27 -0700 Subject: [PATCH] geos package is retired on c9s for CS-362 --- .gitignore | 5 - dead.package | 1 + geos.spec | 335 ------------------------------------------- geos_libsuffix.patch | 72 ---------- sources | 2 - 5 files changed, 1 insertion(+), 414 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 geos.spec delete mode 100644 geos_libsuffix.patch delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index dfeec89..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/geos-3.7.1.tar.bz2 -/geos-3.8.0.tar.bz2 -/check_doxygen_errors.cmake -/geos-3.8.1.tar.bz2 -/geos-3.9.0.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d0e9543 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +geos package is retired on c9s for CS-362 diff --git a/geos.spec b/geos.spec deleted file mode 100644 index 4b6f3bd..0000000 --- a/geos.spec +++ /dev/null @@ -1,335 +0,0 @@ -Name: geos -Version: 3.9.0 -Release: 3%{?dist} -Summary: GEOS is a C++ port of the Java Topology Suite - -License: LGPLv2 -URL: http://trac.osgeo.org/geos/ -Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2 -# File missing in tarball -Source1: http://git.osgeo.org/gitea/geos/geos/raw/tag/%{version}/doc/check_doxygen_errors.cmake - -# Honour libsuffix -Patch1: geos_libsuffix.patch - -BuildRequires: cmake -BuildRequires: doxygen -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: make - - -%description -GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology -Suite (JTS). As such, it aims to contain the complete functionality of -JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial -predicate functions and spatial operators, as well as specific JTS topology -functions such as IsValid() - - -%package devel -Summary: Development files for GEOS -Requires: %{name} = %{version}-%{release} - -%description devel -GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology -Suite (JTS). As such, it aims to contain the complete functionality of -JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial -predicate functions and spatial operators, as well as specific JTS topology -functions such as IsValid(). - -This package contains the development files to build applications that -use GEOS. - - -%prep -%autosetup -p1 -cp -a %{SOURCE1} doc/check_doxygen_errors.cmake - - -%build -%cmake \ -%ifarch armv7hl - -DDISABLE_GEOS_INLINE=ON \ -%endif - -DBUILD_DOCUMENTATION=ON -%cmake_build - - -%install -%cmake_install -make docs -C %{__cmake_builddir} - - -%check -%ctest - - -%ldconfig_scriptlets - - -%files -%doc AUTHORS NEWS README.md -%license COPYING -%{_libdir}/libgeos.so.3.9.0 -%{_libdir}/libgeos_c.so.1* - -%files devel -%doc %{__cmake_builddir}/doc/doxygen_docs -%{_bindir}/geos-config -%{_includedir}/geos/ -%{_includedir}/geos_c.h -%{_libdir}/libgeos_c.so -%{_libdir}/libgeos.so -%{_libdir}/cmake/GEOS/ -%{_libdir}/pkgconfig/%{name}.pc - - -%changelog -* Wed Mar 10 2021 Benjamin A. Beasley - 3.9.0-3 -- Fix RHBZ#1937424 (Wrong output from geos-config --libs etc.) -- Fix RHBZ#1937443 (Wrong output from pkgconf geos --libs etc.) - -* Tue Jan 26 2021 Fedora Release Engineering - 3.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Dec 10 2020 Sandro Mani - 3.9.0-1 -- Update to 3.9.0 - -* Mon Jul 27 2020 Fedora Release Engineering - 3.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 16 2020 Miro Hrončok - 3.8.1-2 -- Remove ttmath in favour of DD (#1841335) - -* Wed Mar 11 2020 Sandro Mani - 3.8.1-1 -- Update to 3.8.1 - -* Tue Mar 03 2020 Sandro Mani - 3.8.0-2 -- Install libgeos.so - -* Thu Feb 20 2020 Sandro Mani - 3.8.0-1 -- Update to 3.8.0 - -* Tue Jan 28 2020 Fedora Release Engineering - 3.7.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 3.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Feb 04 2019 Devrim Gündüz - 3.7.1-1 -- Update to 3.7.1 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.6.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 15 2019 Miro Hrončok - 3.6.1-11 -- Subpackage python2-geos has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Wed Jul 25 2018 Devrim Gündüz - 3.6.1-10 -- Fix #1606885 - -* Fri Jul 13 2018 Fedora Release Engineering - 3.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 14 2018 Iryna Shcherbina - 3.6.1-8 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 3.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 3.6.1-6 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.6.1-5 -- Python 2 binary package renamed to python2-geos - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Wed Aug 02 2017 Fedora Release Engineering - 3.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Dec 28 2016 Devrim Gündüz - 3.6.1-1 -- Update to 3.6.1 -- Remove -php subpackage, it is now a separate project. - -* Tue Jul 19 2016 Fedora Release Engineering - 3.5.0-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue Apr 5 2016 Tom Hughes - 3.5.0-3 -- Patch FTBFS with gcc 6. Fixes #1305276 . - -* Wed Feb 03 2016 Fedora Release Engineering - 3.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 13 2015 Devrim GUNDUZ - 3.5.0-1 -- Update to 3.5.0, per changes described at: - http://trac.osgeo.org/geos/browser/tags/3.5.0/NEWS -- Add swig as BR to python subpackage, as it does not build without that. - -* Wed Jun 17 2015 Fedora Release Engineering - 3.4.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 3.4.2-5 -- Rebuilt for GCC 5 C++11 ABI change - -* Thu Feb 26 2015 Orion Poplawski - 3.4.2-4 -- Rebuild for gcc 5 C++11 ABI - -* Sat Aug 16 2014 Fedora Release Engineering - 3.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Sep 11 2013 Devrim GUNDUZ - 3.4.2-1 -- Update to 3.4.2, per changes described in: - http://trac.osgeo.org/geos/browser/tags/3.4.2/NEWS -- Remove Patch2, it is now in upstream. -- Disable ruby bindings -- Remove all conditionals -- no more RHEL 4! - -* Sat Aug 03 2013 Fedora Release Engineering - 3.3.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Mar 13 2013 Vít Ondruch - 3.3.8-2 -- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 - -* Wed Mar 6 2013 Devrim GUNDUZ - 3.3.8-1 -- Update to 3.3.8, per changes described in: - http://trac.osgeo.org/geos/browser/tags/3.3.8/NEWS - -* Fri Jan 25 2013 Devrim GUNDUZ - 3.3.7-1 -- Update to 3.3.7, per changes described in: - http://trac.osgeo.org/geos/browser/tags/3.3.7/NEWS - -* Fri Nov 16 2012 Devrim GUNDUZ - 3.3.6-1 -- Update to 3.3.6, per changes described in: - http://trac.osgeo.org/geos/browser/tags/3.3.6/NEWS - -* Tue Nov 13 2012 Devrim GUNDUZ - 3.3.5-1 -- Update to 3.3.5 -- Remove patch3, already in upstream. - -* Thu Jul 19 2012 Fedora Release Engineering - 3.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Feb 27 2012 Vít Ondruch - 3.3.2-2 -- Rebuilt for Ruby 1.9.3. -- Rebuilt for PHP 5.4. - -* Mon Jan 09 2012 Devrim GUNDUZ - 3.3.2-1 -- Update to 3.3.2 - -* Tue Dec 27 2011 Rex Dieter 3.3.1-3 -- track soname so abi bumps aren't a surprise - -* Tue Oct 18 2011 Devrim GUNDUZ - 3.3.1-2 -- Enable PHP bindings, per Peter Hopfgartner, bz #746574 - -* Tue Oct 4 2011 Devrim GUNDUZ - 3.3.1-1 -- Update to 3.3.1 - -* Wed Jun 1 2011 Devrim GUNDUZ - 3.3.0-1 -- Update to 3.3.0 -- Remove 2 patches. - -* Mon May 9 2011 Devrim GUNDUZ - 3.2.2-1 -- Update to 3.2.2 -- Add a patch to fix builds on ARM, per bz #682538 - -* Tue Feb 08 2011 Fedora Release Engineering - 3.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 21 2010 David Malcolm - 3.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Wed Jul 21 2010 Dan Horák - 3.2.1-2 -- fix build with swig 2.0.0 - -* Tue Mar 30 2010 Devrim GUNDUZ - 3.2.1-1 -- Update to 3.2.1 - -* Thu Mar 18 2010 Balint Cristian - 3.2.0-2 -- fix bz#473975 - -* Sun Dec 20 2009 Devrim GUNDUZ - 3.2.0-1 -- Update to 3.2.0 - -* Thu Dec 03 2009 Devrim GÜNDÜZ - 3.2.0-rc3_1.1 -- Fix spec (dep error). - -* Wed Dec 2 2009 Devrim GUNDUZ - 3.2.0rc3-1 -- Update to 3.2.0 rc3 - -* Fri Jul 24 2009 Fedora Release Engineering - 3.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 18 2009 Devrim GUNDUZ - 3.1.1-1 -- Update to 3.1.1 -- Update URL and download URL. -- Apply cosmetic changes to spec file. - -* Sun Apr 26 2009 Devrim GUNDUZ - 3.1.0-1 -- Update to 3.1.0 - -* Tue Feb 24 2009 Fedora Release Engineering - 3.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Dec 06 2008 Balint Cristian - 3.0.3-1 -- new upstream stable - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.0.1-2 -- Rebuild for Python 2.6 - -* Fri Oct 17 2008 Balint Cristian - 3.0.1-1 -- new stable bugfix -- fix another gcc43 header - -* Wed May 28 2008 Balint Cristian - 3.0.0-4 -- disable bindings for REL4 - -* Wed Apr 23 2008 Balint Cristian - 3.0.0-3 -- require ruby too - -* Wed Apr 23 2008 Balint Cristian - 3.0.0-2 -- remove python-abi request, koji fails - -* Sun Apr 20 2008 Balint Cristian - 3.0.0-1 -- New branch upstream -- Fix gcc43 build -- Avoid r-path hardcoding -- Enable and include python module -- Enable and include ruby module -- Enable and run testsuite during build - -* Tue Feb 19 2008 Fedora Release Engineering - 2.2.3-2 -- Autorebuild for GCC 4.3 - -* Mon Jan 8 2007 Shawn McCann - 2.2.3-1 -- Upgraded to geos-2.2.3 and removed patches - -* Sat Sep 16 2006 Shawn McCann - 2.2.1-5 -- Rebuild for Fedora Extras 6 - -* Sat Mar 4 2006 Shawn McCann - 2.2.1-4 -- Rebuild for Fedora Extras 5 - -* Sat Jan 14 2006 Shawn McCann - 2.2.1-3 -- Updated gcc4 patch - -* Wed Jan 11 2006 Ralf Corsépius - 2.2.1-2 -- Add gcc4 patch - -* Sat Dec 31 2005 Shawn McCann - 2.2.1-1 -- Updated to address review comments in bug 17039 - -* Fri Dec 30 2005 Shawn McCann - 2.2.1-1 -- Initial release diff --git a/geos_libsuffix.patch b/geos_libsuffix.patch deleted file mode 100644 index 75adcb4..0000000 --- a/geos_libsuffix.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -rupN --no-dereference geos-3.9.0/CMakeLists.txt geos-3.9.0-new/CMakeLists.txt ---- geos-3.9.0/CMakeLists.txt 2020-12-09 18:17:36.000000000 +0100 -+++ geos-3.9.0-new/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100 -@@ -300,16 +300,16 @@ configure_file(cmake/geos-config.cmake - - install(TARGETS geos geos_cxx_flags - EXPORT geos-targets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - INCLUDES DESTINATION include - ) - - install(TARGETS geos_c - EXPORT geos-targets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - INCLUDES DESTINATION include - ) -@@ -317,12 +317,12 @@ install(TARGETS geos_c - install(EXPORT geos-targets - FILE geos-targets.cmake - NAMESPACE GEOS:: -- DESTINATION lib/cmake/GEOS) -+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS) - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake" -- DESTINATION lib/cmake/GEOS) -+ DESTINATION lib${LIB_SUFFIX}/cmake/GEOS) - install(DIRECTORY - "${CMAKE_CURRENT_LIST_DIR}/include/geos" - "${CMAKE_CURRENT_BINARY_DIR}/include/geos" -diff -rupN --no-dereference geos-3.9.0/tools/CMakeLists.txt geos-3.9.0-new/tools/CMakeLists.txt ---- geos-3.9.0/tools/CMakeLists.txt 2020-12-09 18:17:36.000000000 +0100 -+++ geos-3.9.0-new/tools/CMakeLists.txt 2021-03-10 19:25:20.832864575 +0100 -@@ -36,7 +36,7 @@ if(NOT MSVC) - - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/geos.pc -- DESTINATION lib/pkgconfig) -+ DESTINATION lib${LIB_SUFFIX}/pkgconfig) - - endif() - -diff -rupN --no-dereference geos-3.9.0/tools/geos-config.cmake geos-3.9.0-new/tools/geos-config.cmake ---- geos-3.9.0/tools/geos-config.cmake 2020-07-21 20:07:17.000000000 +0200 -+++ geos-3.9.0-new/tools/geos-config.cmake 2021-03-10 19:25:20.832864575 +0100 -@@ -1,7 +1,7 @@ - #!/bin/sh - - prefix=@ESCAPED_INSTALL_PREFIX@ --libdir=${prefix}/lib -+libdir=${prefix}/lib@LIB_SUFFIX@ - - usage() - { -diff -rupN --no-dereference geos-3.9.0/tools/geos.pc.cmake geos-3.9.0-new/tools/geos.pc.cmake ---- geos-3.9.0/tools/geos.pc.cmake 2020-12-09 18:17:36.000000000 +0100 -+++ geos-3.9.0-new/tools/geos.pc.cmake 2021-03-10 19:25:20.833864575 +0100 -@@ -8,4 +8,4 @@ Description: Geometry Engine, Open Sourc - Requires: - Version: @GEOS_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lgeos_c -+Libs: -L${libdir}@LIB_SUFFIX@ -lgeos_c diff --git a/sources b/sources deleted file mode 100644 index bebba1e..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (check_doxygen_errors.cmake) = 4764415b279cd7583f8ec2e0150ab2e87f12f7b9c6249ee03bf3a368c12f698c586a6b116ae892395b7d46d620f96d2a1ac6aa16ce4bbf4dc2cdedca9f12e07f -SHA512 (geos-3.9.0.tar.bz2) = 518be112b2e05063d97c09d0e568b784e6c65b0a7be1368cefbd481b3f4ac2d8fc89611e6e205a95f4d1740ab4f47b3929fb4c801bcf9a9e9b6ae86a54e62933