Compare commits

..

No commits in common. "rawhide" and "f32" have entirely different histories.
rawhide ... f32

4 changed files with 28 additions and 273 deletions

2
.gitignore vendored
View File

@ -1,4 +1,2 @@
/libgeotiff-1.5.1.tar.gz
/libgeotiff-1.6.0.tar.gz
/libgeotiff-1.7.0.tar.gz
/libgeotiff-1.7.1.tar.gz

View File

@ -1,47 +1,12 @@
%if 0%{?rhel} >= 9
%bcond_with mingw
%else
%bcond_without mingw
%endif
Name: libgeotiff
Version: 1.7.1
Release: 7%{?dist}
Summary: GeoTIFF format library
License: MIT
URL: http://trac.osgeo.org/geotiff/
Source: http://download.osgeo.org/geotiff/%{name}/%{name}-%{version}.tar.gz
# Honour LIB_SUFFIX
# Honour GEOTIFF_INCLUDE_SUBDIR
# Add version suffix to mingw library
# Fix cmake module install dir
# Don't install docs
Patch0: libgeotiff_cmake.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
BuildRequires: proj-devel
BuildRequires: zlib-devel
%if %{with mingw}
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-libtiff
BuildRequires: mingw32-libjpeg
BuildRequires: mingw32-proj
BuildRequires: mingw32-zlib
BuildRequires: mingw64-filesystem >= 95
BuildRequires: mingw64-gcc
BuildRequires: mingw64-libtiff
BuildRequires: mingw64-libjpeg
BuildRequires: mingw64-proj
BuildRequires: mingw64-zlib
%endif
Name: libgeotiff
Version: 1.6.0
Release: 1%{?dist}
Summary: GeoTIFF format library
License: MIT
URL: http://trac.osgeo.org/geotiff/
Source: http://download.osgeo.org/geotiff/%{name}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: libtiff-devel libjpeg-devel proj-devel >= 6.2.0 zlib-devel
%description
GeoTIFF represents an effort by over 160 different remote sensing,
@ -57,74 +22,28 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The GeoTIFF library provides support for development of geotiff image format.
%if %{with mingw}
%package -n mingw32-%{name}
Summary: MinGW Windows %{name} library
Obsoletes: mingw32-%{name}-static
BuildArch: noarch
%description -n mingw32-%{name}
%{summary}.
%package -n mingw32-%{name}-tools
Summary: Tools for the MinGW Windows %{name} library
Requires: mingw32-%{name} = %{version}-%{release}
BuildArch: noarch
%description -n mingw32-%{name}-tools
%{summary}.
%package -n mingw64-%{name}
Summary: MinGW Windows %{name} library
Obsoletes: mingw64-%{name}-static
BuildArch: noarch
%description -n mingw64-%{name}
%{summary}.
%package -n mingw64-%{name}-tools
Summary: Tools for the MinGW Windows %{name} library
Requires: mingw64-%{name} = %{version}-%{release}
BuildArch: noarch
%description -n mingw64-%{name}-tools
%{summary}.
%{?mingw_debug_package}
%endif
%prep
%autosetup -p1 -n %{name}-%{version}
%setup -q
%build
# Native build
%cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name} -DGEOTIFF_LIB_SUBDIR=%{_lib}
%cmake_build
%configure \
--prefix=%{_prefix} \
--includedir=%{_includedir}/%{name}/ \
--with-proj \
--with-jpeg \
--with-zip \
--disable-static
%if %{with mingw}
# MinGW build
%mingw_cmake -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_INCLUDE_SUBDIR=include/%{name}
%mingw_make_build
%endif
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build %{?_smp_mflags}
%install
%cmake_install
%if %{with mingw}
%mingw_make_install
%endif
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
# install pkgconfig file
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
cat > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc <<EOF
cat > %{name}.pc <<EOF
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
@ -137,43 +56,11 @@ Libs: -L\${libdir} -lgeotiff
Cflags: -I\${includedir}
EOF
%if %{with mingw}
mkdir -p %{buildroot}%{mingw32_libdir}/pkgconfig/
cat > %{buildroot}%{mingw32_libdir}/pkgconfig/%{name}.pc <<EOF
prefix=%{mingw32_prefix}
exec_prefix=%{mingw32_prefix}
libdir=%{mingw32_libdir}
includedir=%{mingw32_includedir}/%{name}
Name: %{name}
Description: GeoTIFF file format library
Version: %{version}
Libs: -L\${libdir} -lgeotiff
Cflags: -I\${includedir}
EOF
mkdir -p %{buildroot}%{mingw64_libdir}/pkgconfig/
cat > %{buildroot}%{mingw64_libdir}/pkgconfig/%{name}.pc <<EOF
prefix=%{mingw64_prefix}
exec_prefix=%{mingw64_prefix}
libdir=%{mingw64_libdir}
includedir=%{mingw64_includedir}/%{name}
Name: %{name}
Description: GeoTIFF file format library
Version: %{version}
Libs: -L\${libdir} -lgeotiff
Cflags: -I\${includedir}
EOF
%mingw_debug_install_post
%endif
%check
%ctest
%{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig/
%{__install} -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
#clean up junks
%{__rm} -fv %{buildroot}%{_libdir}/lib*.la
%files
%license LICENSE
@ -181,100 +68,15 @@ EOF
%{_bindir}/applygeo
%{_bindir}/geotifcp
%{_bindir}/listgeo
%{_bindir}/makegeo
%{_libdir}/%{name}.so.5*
%{_mandir}/man1/*.1*
%files devel
%{_includedir}/%{name}/
%{_includedir}/%{name}
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/cmake/GeoTIFF/
%if %{with mingw}
%files -n mingw32-%{name}
%doc ChangeLog README
%license COPYING
%{mingw32_bindir}/libgeotiff-5.dll
%{mingw32_includedir}/%{name}/
%{mingw32_datadir}/*
%{mingw32_libdir}/libgeotiff.dll.a
%{mingw32_libdir}/pkgconfig/libgeotiff.pc
%{mingw32_libdir}/cmake/GeoTIFF/
%files -n mingw32-%{name}-tools
%{mingw32_bindir}/*.exe
%files -n mingw64-%{name}
%doc ChangeLog README
%license COPYING
%{mingw64_bindir}/libgeotiff-5.dll
%{mingw64_includedir}/%{name}/
%{mingw64_datadir}/*
%{mingw64_libdir}/libgeotiff.dll.a
%{mingw64_libdir}/pkgconfig/libgeotiff.pc
%{mingw64_libdir}/cmake/GeoTIFF/
%files -n mingw64-%{name}-tools
%{mingw64_bindir}/*.exe
%endif
%changelog
* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 1.7.1-7
- Rebuild (proj)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Sep 04 2022 Sandro Mani <manisandro@gmail.com> - 1.7.1-5
- Rebuild (proj)
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jun 10 2022 Orion Poplawski <orion@nwra.com> - 1.7.1-3
- Make mingw build conditional, disable for EL9
* Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 1.7.1-2
- Rebuild with mingw-gcc-12
* Mon Mar 14 2022 Sandro Mani <manisandro@gmail.com> - 1.7.1-1
- Update to 1.7.1
* Wed Mar 09 2022 Sandro Mani <manisandro@gmail.com> - 1.7.0-8
- Rebuild for proj-9.0.0
* Tue Mar 08 2022 Sandro Mani <manisandro@gmail.com> - 1.7.0-7
- Fix broken mingw pkg-config files
* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 1.7.0-6
- Make mingw subpackages noarch
* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 1.7.0-5
- Add mingw subpackage
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jul 06 2021 Sandro Mani <manisandro@gmail.com> - 1.7.0-1
- Update to 1.7.0
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 1.6.0-5
- Rebuild (proj)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 12 00:10:50 CET 2020 Sandro Mani <manisandro@gmail.com> - 1.6.0-3
- Rebuild (proj)
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 12 2020 Sandro Mani <manisandro@gmail.com> - 1.6.0-1
- Update to 1.6.0

View File

@ -1,45 +0,0 @@
diff -rupN --no-dereference libgeotiff-1.7.1/cmake/CMakeLists.txt libgeotiff-1.7.1-new/cmake/CMakeLists.txt
--- libgeotiff-1.7.1/cmake/CMakeLists.txt 2022-02-18 16:07:34.000000000 +0100
+++ libgeotiff-1.7.1-new/cmake/CMakeLists.txt 2022-03-14 23:38:20.294077484 +0100
@@ -6,13 +6,8 @@
# ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
# path to the root from there. (Note that the whole install tree can
# be relocated.)
-if (NOT WIN32)
- set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
- set (PROJECT_ROOT_DIR "../../..")
-else ()
- set (INSTALL_CMAKE_DIR "cmake")
- set (PROJECT_ROOT_DIR "..")
-endif ()
+set (INSTALL_CMAKE_DIR "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
+set (PROJECT_ROOT_DIR "../../..")
configure_file (project-config.cmake.in project-config.cmake @ONLY)
configure_file (project-config-version.cmake.in
diff -rupN --no-dereference libgeotiff-1.7.1/CMakeLists.txt libgeotiff-1.7.1-new/CMakeLists.txt
--- libgeotiff-1.7.1/CMakeLists.txt 2022-03-10 09:32:14.000000000 +0100
+++ libgeotiff-1.7.1-new/CMakeLists.txt 2022-03-14 23:38:20.295077481 +0100
@@ -261,9 +261,9 @@ SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR
SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR})
# Install doc files
-INSTALL(FILES
- AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
- DESTINATION doc)
+#INSTALL(FILES
+ #AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
+ #DESTINATION doc)
# Install man pages
INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
@@ -329,6 +329,9 @@ endif()
SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
OUTPUT_NAME ${GEOTIFF_LIB_NAME})
+IF(MINGW)
+ SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES SUFFIX "-${LINK_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ENDIF(MINGW)
set(CONFIG_DEPENDENCIES "")
if(TARGET TIFF::TIFF)

View File

@ -1 +1 @@
SHA512 (libgeotiff-1.7.1.tar.gz) = af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1
SHA512 (libgeotiff-1.6.0.tar.gz) = 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418