Compare commits

...

28 Commits
f32 ... rawhide

Author SHA1 Message Date
Fedora Release Engineering
69c0548dbb Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 13:56:48 +00:00
Sandro Mani
aeabe5cf3c Update to 1.7.3 2024-05-25 12:21:31 +02:00
Sandro Mani
918baae862 Rebuild (proj) 2024-03-05 15:56:30 +01:00
Fedora Release Engineering
ff98d2509a Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 02:15:28 +00:00
Fedora Release Engineering
871174e80e Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 04:10:20 +00:00
Sandro Mani
88e0597ca9 Rebuild (proj) 2023-09-03 21:55:12 +02:00
Fedora Release Engineering
16015858a9 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 10:56:55 +00:00
Orion Poplawski
59181af5ea Change BR to mingw*-gcc-c++ 2023-05-17 21:13:01 -06:00
Sandro Mani
b37c6ba7b6 Rebuild (proj) 2023-03-04 08:59:22 +01:00
Fedora Release Engineering
2f3a543bfa Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 16:24:55 +00:00
Sandro Mani
94d89aa564 Rebuild (proj) 2022-09-04 19:51:19 +02:00
Fedora Release Engineering
e9de7a4be5 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 17:53:20 +00:00
Orion Poplawski
546b9cf4f7 Make mingw build conditional, disable for EL9 2022-06-10 21:44:31 -06:00
Sandro Mani
6578759b03 Rebuild with mingw-gcc-12 2022-03-25 13:58:02 +01:00
Sandro Mani
903e84f241 Update to 1.7.1 2022-03-14 23:53:42 +01:00
Sandro Mani
cc3e18728b Rebuild for proj-9.0.0 2022-03-09 23:15:09 +01:00
Sandro Mani
227339e1ab Fix broken mingw pkg-config files 2022-03-08 13:45:57 +01:00
Sandro Mani
7e942b68bc Narrow down %files 2022-03-08 13:41:05 +01:00
Sandro Mani
e9cbb5c065 Make mingw subpackages noarch 2022-02-24 20:07:36 +01:00
Sandro Mani
67748c83bc Add mingw subpackages 2022-02-24 11:13:44 +01:00
Fedora Release Engineering
27c8374e5e - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 16:17:34 +00:00
Fedora Release Engineering
5384b61ef4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 11:27:00 +00:00
Sandro Mani
5c5b4864c9 Update to 1.7.0 2021-07-06 08:53:28 +02:00
Sandro Mani
5051a131b9 Rebuild (proj) 2021-03-07 11:12:50 +01:00
Fedora Release Engineering
be3f3359cf - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 17:08:03 +00:00
Tom Stellard
6d0d064cd7 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-05 01:52:57 +00:00
Sandro Mani
76d3ddeb43 Rebuild (proj) 2020-11-12 00:11:01 +01:00
Fedora Release Engineering
826f7bf425 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 04:43:13 +00:00
4 changed files with 301 additions and 29 deletions

3
.gitignore vendored
View File

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

View File

@ -1,12 +1,47 @@
%if 0%{?rhel} >= 9
%bcond_with mingw
%else
%bcond_without mingw
%endif
Name: libgeotiff
Version: 1.6.0
Release: 1%{?dist}
Version: 1.7.3
Release: 2%{?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 libjpeg-devel proj-devel >= 6.2.0 zlib-devel
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
BuildRequires: proj-devel
BuildRequires: zlib-devel
%if %{with mingw}
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-libtiff
BuildRequires: mingw32-libjpeg
BuildRequires: mingw32-proj
BuildRequires: mingw32-zlib
BuildRequires: mingw64-filesystem >= 95
BuildRequires: mingw64-gcc-c++
BuildRequires: mingw64-libtiff
BuildRequires: mingw64-libjpeg
BuildRequires: mingw64-proj
BuildRequires: mingw64-zlib
%endif
%description
GeoTIFF represents an effort by over 160 different remote sensing,
@ -22,28 +57,76 @@ 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
%setup -q
%autosetup -p1 -n %{name}-%{version}
%build
%configure \
--prefix=%{_prefix} \
--includedir=%{_includedir}/%{name}/ \
--with-proj \
--with-jpeg \
--with-zip \
--disable-static
# Native build
%cmake -DGEOTIFF_BIN_SUBDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name}
%cmake_build
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
%if %{with mingw}
# MinGW build
MINGW32_CMAKE_ARGS=-DCMAKE_INSTALL_INCLUDEDIR=%{mingw32_includedir}/%{name} \
MINGW64_CMAKE_ARGS=-DCMAKE_INSTALL_INCLUDEDIR=%{mingw64_includedir}/%{name} \
%mingw_cmake
%mingw_make_build
%endif
%make_build %{?_smp_mflags}
%install
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
%cmake_install
%if %{with mingw}
%mingw_make_install
%endif
# install pkgconfig file
cat > %{name}.pc <<EOF
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
cat > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc <<EOF
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
@ -51,16 +134,48 @@ includedir=%{_includedir}/%{name}
Name: %{name}
Description: GeoTIFF file format library
Version: %{version}
Version: 1.7.3
Libs: -L\${libdir} -lgeotiff
Cflags: -I\${includedir}
EOF
%{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig/
%{__install} -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
%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: 1.7.3
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: 1.7.3
Libs: -L\${libdir} -lgeotiff
Cflags: -I\${includedir}
EOF
%mingw_debug_install_post
%endif
%check
%ctest
#clean up junks
%{__rm} -fv %{buildroot}%{_libdir}/lib*.la
%files
%license LICENSE
@ -68,15 +183,124 @@ 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
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat May 25 2024 Sandro Mani <manisandro@gmail.com> - 1.7.3-1
- Update to 1.7.3
* Tue Mar 05 2024 Sandro Mani <manisandro@gmail.com> - 1.7.1-13
- Rebuild (proj)
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Sep 03 2023 Sandro Mani <manisandro@gmail.com> - 1.7.1-10
- Rebuild (proj)
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu May 18 2023 Orion Poplawski <orion@nwra.com> - 1.7.1-8
- Change BR to mingw*-gcc-c++
* 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

45
libgeotiff_cmake.patch Normal file
View File

@ -0,0 +1,45 @@
diff -rupN libgeotiff-1.7.3/cmake/CMakeLists.txt libgeotiff-1.7.3-new/cmake/CMakeLists.txt
--- libgeotiff-1.7.3/cmake/CMakeLists.txt 2022-02-18 16:07:34.000000000 +0100
+++ libgeotiff-1.7.3-new/cmake/CMakeLists.txt 2024-05-25 11:33:17.823041296 +0200
@@ -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 libgeotiff-1.7.3/CMakeLists.txt libgeotiff-1.7.3-new/CMakeLists.txt
--- libgeotiff-1.7.3/CMakeLists.txt 2024-05-24 15:38:59.000000000 +0200
+++ libgeotiff-1.7.3-new/CMakeLists.txt 2024-05-25 11:35:20.294177785 +0200
@@ -244,9 +244,9 @@ SET(GEOTIFF_MAN_PAGES
# ${PROJECT_BINARY_DIR}/geotiff_version.h
# Install doc files
-INSTALL(FILES
- AUTHORS ChangeLog COPYING LICENSE README README_BIN README.WIN
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
+# INSTALL(FILES
+ # AUTHORS ChangeLog COPYING LICENSE README README_BIN README.WIN
+ # DESTINATION ${CMAKE_INSTALL_DOCDIR})
# Install man pages
INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
@@ -312,6 +312,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_PUBLIC_DEPENDENCIES "")
set(CONFIG_PRIVATE_DEPENDENCIES "")

View File

@ -1 +1 @@
SHA512 (libgeotiff-1.6.0.tar.gz) = 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
SHA512 (libgeotiff-1.7.3.tar.gz) = a523d6117c7433fe37b7c0cdcba81698426cd4b084bcb35c7dacc9e87bfda1ab7a4c16a9aa64a69dedb78edc2f85e8032bf8b158411f50909603e04d13821cd3